ID

cc03935

date

2025-04-23 05:53:42+00:00

author

Alex Chan <alex@alexwlchan.net>

parent

2eed7fd

message

These should be against `origin`

changed files

1 file, 2 additions, 2 deletions

• git/gp

Changed files

git/gp (325) → git/gp (339)

diff --git a/git/gp b/git/gp
index 495348e..1cf266e 100755
--- a/git/gp
+++ b/git/gp
@@ -13,8 +13,8 @@ gf
 if [[ "${1:-}" == "--rebase" ]]
 then
   print_info "-> git rebase $HEAD"
-  git rebase "$HEAD"
+  git rebase "origin/$HEAD"
 else
   print_info "-> git merge $HEAD"
-  git merge "$HEAD"
+  git merge "origin/$HEAD"
 fi