mirrors-shell
/
aurutils
mirror of https://github.com/AladW/aurutils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity Software Blog

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.
This commit is contained in:
Alad Wenter 2022-07-03 18:56:25 +02:00
parent bb70a0ab8a
commit 67a70c9a1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/aur-fetch
View File

@ -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}' ;;