diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-02-22 20:42:03 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-02-22 20:42:03 -0300 |
| commit | 08f4a2f517a31742d4085eca6f59ec0054036593 (patch) | |
| tree | 4930a33428f31e87099c6b867435aee8c70d4f01 | |
| parent | 9717279fa1c55ac132e660b75e25f38bbccc1121 (diff) | |
| download | apps-08f4a2f517a31742d4085eca6f59ec0054036593.tar.gz apps-08f4a2f517a31742d4085eca6f59ec0054036593.tar.bz2 | |
Inceptions: adds fetch and merge actions
| -rwxr-xr-x | inception | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -80,4 +80,8 @@ EOF fi elif [ "$1" == "version" ]; then ( cd $DIRNAME && git log -n 1 ) +elif [ "$1" == "fetch" ]; then + ( cd $DIRNAME && git fetch --all && git log -n 1 --branches=origin/master ) +elif [ "$1" == "merge" ]; then + ( cd $DIRNAME && git merge origin/master ) fi |