dot/git
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch from --rebase=preserve, which is deprecated, to --rebase=merges

Browse source
This commit is contained in:
Danielle McLean 2020-03-27 14:16:06 +11:00
parent 1427a22db4
commit f4fcd2e08a
Signed by: 00dani
GPG key ID: FF6F9216852288FF
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/git/config
View file

@ -8,7 +8,7 @@
co = checkout co = checkout
d = diff d = diff
l = log --graph --pretty=graph --date=relative l = log --graph --pretty=graph --date=relative
up = pull --prune --rebase=preserve --autostash up = pull --prune --rebase=merges --autostash
patch = !git --no-pager diff --no-color patch = !git --no-pager diff --no-color
st = status --short st = status --short
shove = "!f() { git push ${1:-origin} :; }; f" shove = "!f() { git push ${1:-origin} :; }; f"