diff options
| author | William Carroll <wpcarro@gmail.com> | 2017-08-01T21·51-0400 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2017-08-01T21·51-0400 |
| commit | 27faf0c14d8dc99d7505979947b733a5a5ee62c2 (patch) | |
| tree | 3bd55c65a1fae26d5682a57fcb8056c11aea7fad /configs/shared | |
| parent | 4eb9908e2f1afba0eac36042945d9b83fc787d1f (diff) | |
Adds git aliases for viewing conflicts
Diffstat (limited to 'configs/shared')
| -rw-r--r-- | configs/shared/.gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/shared/.gitconfig b/configs/shared/.gitconfig index 4404e8278f0e..cd33cfa01c99 100644 --- a/configs/shared/.gitconfig +++ b/configs/shared/.gitconfig @@ -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] |