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

Remove deprecated git-up configuration and port it across to the current 'up' alias

Browse source
This commit is contained in:
Danielle McLean 2018-03-15 11:38:12 +11:00
parent a91decbc47
commit b083b68e4f
Signed by: 00dani
GPG key ID: 5A5D2D1AFF12EEC5
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
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 --rebase --autostash up = pull --rebase=preserve --autostash
st = status --short st = status --short
shove = "!f() { git push ${1:-origin} :; }; f" shove = "!f() { git push ${1:-origin} :; }; f"
@ -21,9 +21,6 @@
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[git-up.rebase]
arguments = --preserve-merges
[gpg] [gpg]
program = gpg-for-git-signing program = gpg-for-git-signing