diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -29,6 +29,7 @@ f = fetch -pv fa = fetch -p --all up = pull --rebase + sed = ! git grep -z --full-name -l '.' | xargs -0 sed -i -e [merge] tool = kdiff3 conflictstyle = diff3 |