maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds git aliases for viewing conflicts

Browse source
This commit is contained in:
William Carroll 2017-08-01 17:51:06 -04:00
parent 4eb9908e2f
commit 27faf0c14d
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configs/shared/.gitconfig
View file

@ -6,6 +6,7 @@
recent = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\"
today = log --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\"
changed-files =
conflicts = diff --name-only --diff-filter=U
[commit]
gpgsign = true
[gpg]