diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -26,6 +26,7 @@ ri = rebase -i --autosquash fix = commit --fixup list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)' + f = fetch -p --all [merge] tool = kdiff3 conflictstyle = diff3 |