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

no backup files after merge

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2014-02-03 14:39:12 +01:00
parent ccb88a1ece
commit 51e8fa277e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitconfig.cygwin
View file

@ -2,4 +2,3 @@
path = dev/dotfiles/.gitconfig_includes.common path = dev/dotfiles/.gitconfig_includes.common
path = dev/dotfiles/.gitconfig_includes.cygwin path = dev/dotfiles/.gitconfig_includes.cygwin

3
.gitconfig_includes.common
View file

@ -11,4 +11,5 @@
pager = cat pager = cat
[alias] [alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 6 tree = log --show-signature --color --decorate --date=short --all --graph -n 6
[mergetool]
keepBackup = false