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 | |
| parent | 4eb9908e2f1afba0eac36042945d9b83fc787d1f (diff) | |
Adds git aliases for viewing conflicts
| -rw-r--r-- | aliases.sh | 1 | ||||
| -rw-r--r-- | configs/shared/.gitconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/aliases.sh b/aliases.sh index 14787a62c990..4d56755989be 100644 --- a/aliases.sh +++ b/aliases.sh @@ -21,6 +21,7 @@ command -v tmux >/dev/null && alias tls='tmux list-sessions' || \ # git-specific aliases git config --global alias.recent 'for-each-ref --count=10 --sort=-committerdate refs/heads/ --format="%(refname:short)"' git config --global alias.today 'log --since=00:00:00 --all --no-merges --oneline --author="$(git config --get user.email)"' +git config --global alias.conflicts 'diff --name-only --diff-filter=U' alias glp="git log --graph --pretty=format:'%Cred%h%Creset -%Cblue %an %Creset - %C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" alias gprom="git pull --rebase origin master" 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] |