janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/git: pull easier

This commit is contained in:
xeruf 2021-11-23 15:36:24 +01:00
parent 02c959ce70
commit 1cd3f27084
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/git/config
View File

@ -151,7 +151,7 @@
rb = rebase rb = rebase
rbi = rebase --interactive rbi = rebase --interactive
rbc = rebase --continue rbc = rebase --continue
rbu = rebase @{upstream} rbu = rebase @{upstream} --autostash
rbm = !git rebase $(git main) rbm = !git rebase $(git main)
sta = stash sta = stash

6
.local/bin/scripts/git-l
View File

@ -1,3 +1,5 @@
#!/bin/sh #!/bin/sh
git rev-parse @{upstream} >/dev/null 2>&1 || git branch --set-upstream-to=@{push} git rev-parse @{upstream} >/dev/null 2>&1 ||
git pull --rebase --autostash "$@" || (printf "\e[31;1mError - aborting rebase!\e[0m\n" >&2 && git rebase --abort) git branch --set-upstream-to=@{push}
git pull --rebase --autostash "$@" 2>/dev/null ||
{ printf "\e[31;1mError - aborting rebase!\e[0m\n" >&2 && git rebase --abort; }