ID

348148a

date

2025-05-03 09:39:12+00:00

author

Alex Chan <alex@alexwlchan.net>

parent

f83ba4d

message

Clarify what's happening here

changed files

1 file, 2 additions, 2 deletions

• git/gp

Changed files

git/gp (470) → git/gp (484)

diff --git a/git/gp b/git/gp
index 91c0046..9873484 100755
--- a/git/gp
+++ b/git/gp
@@ -16,9 +16,9 @@ echo ""
 
 if [[ "${1:-}" == "--rebase" ]]
 then
-  print_info "-> git rebase $HEAD"
+  print_info "-> git rebase origin/$HEAD"
   git rebase "origin/$HEAD"
 else
-  print_info "-> git merge $HEAD"
+  print_info "-> git merge origin/$HEAD"
   git merge "origin/$HEAD"
 fi