fetch: say on local branch

The command

  git rebase origin master

will run `git switch master` before doing anything, whereas

  git rebase origin/master

will rebase changes starting from origin/master in the current branch.
pull/1010/head
Alad Wenter 3 months ago
parent bb70a0ab8a
commit 67a70c9a1c
  1. 4
      lib/aur-fetch

@ -165,10 +165,10 @@ fi | while read -r pkg; do
;;& # proceed to merge or rebase
rebase)
dest='HEAD'
git rebase -v "${rebase_args[@]}" origin master ;;
git rebase -v "${rebase_args[@]}" origin/master ;;
merge)
dest='HEAD'
git merge -v "${merge_args[@]}" origin master ;;
git merge -v "${merge_args[@]}" origin/master ;;
reset)
dest='master@{u}'
git reset --hard 'master@{u}' ;;

Loading…
Cancel
Save