allow pulling with –rebase
- ID
69ea742- date
2022-12-16 23:39:31+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
9eef7e3- message
allow pulling with --rebase- changed files
1 file, 7 additions, 1 deletion
Changed files
gp (299) → gp (405)
diff --git a/gp b/gp
index d8f3ffa..45e3ed4 100755
--- a/gp
+++ b/gp
@@ -7,5 +7,11 @@
set -o errexit
set -o nounset
-git pull origin $(git rev-parse --abbrev-ref HEAD)
+if [[ "$1" == "--rebase" ]]
+then
+ git pull origin $(git rev-parse --abbrev-ref HEAD) --rebase
+else
+ git pull origin $(git rev-parse --abbrev-ref HEAD)
+fi
+
git fetch origin --prune