opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: Add aliases for updating local branches

Browse source
This commit is contained in:
Oliver Davies 2020-04-29 13:48:19 +01:00
parent 4a8fd3b6a0
commit 884b13bdf6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tag-git/gitconfig
View file

@ -12,8 +12,10 @@
current-branch = rev-parse --abbrev-ref HEAD current-branch = rev-parse --abbrev-ref HEAD
dc = diff --color --word-diff --cached dc = diff --color --word-diff --cached
df = diff --color --word-diff df = diff --color --word-diff
dup = !git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -
fixup = commit --fixup fixup = commit --fixup
issues = !hub browse -- issues issues = !hub browse -- issues
mup = !git checkout master && git fetch origin && echo && git sl master..origin/master && echo && git pull --quiet && git checkout -
nah = !git reset --hard && git clean -fd nah = !git reset --hard && git clean -fd
no-ff = merge --no-ff no-ff = merge --no-ff
pl = pull pl = pull
@ -21,8 +23,10 @@
ps = push ps = push
pulls = !hub browse -- pulls pulls = !hub browse -- pulls
rbc = rebase --continue rbc = rebase --continue
rdup = !git dup && git rebase develop
remotes = remote -v remotes = remote -v
repush = !git pull --rebase && git push repush = !git pull --rebase && git push
rmup = !git mup && git rebase master
ri = rebase --interactive ri = rebase --interactive
rid = !git rebase -i $(git merge-base develop HEAD) rid = !git rebase -i $(git merge-base develop HEAD)
rim = !git rebase -i $(git merge-base master HEAD) rim = !git rebase -i $(git merge-base master HEAD)