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

Update .gitconfig

Browse source
This commit is contained in:
Oliver Davies 2017-05-08 11:44:29 +01:00
parent 0792da7764
commit 0401865b89
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitconfig
View file

@ -14,6 +14,7 @@
# Add a commit that fixes another (to be used with `rebase -i`). # Add a commit that fixes another (to be used with `rebase -i`).
fixup = commit --fixup fixup = commit --fixup
noff = merge --no-ff noff = merge --no-ff
prune = remote prune origin
remotes = remote -v remotes = remote -v
staged = diff --staged staged = diff --staged
undo = reset --hard undo = reset --hard
@ -82,9 +83,11 @@
rba = rebase --abort rba = rebase --abort
rbc = rebase --continue rbc = rebase --continue
rbi = rebase --interactive rbi = rebase --interactive
s = status --short --branch s = status
sb = show-branch -a sb = show-branch -a
dt = difftool dt = difftool
unmerged = branch --no-merged
unmerged-remote = branch --remote --no-merged
[branch] [branch]
autosetupmerge = true autosetupmerge = true
@ -170,6 +173,8 @@
[pull] [pull]
rebase = true rebase = true
ff = only
[merge] [merge]
defaultToUpstream = true defaultToUpstream = true
ff = false