mdebray/tvl-depot
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aliases.sh
View file

@ -21,6 +21,7 @@ command -v tmux >/dev/null && alias tls='tmux list-sessions' || \
# git-specific aliases # git-specific aliases
git config --global alias.recent 'for-each-ref --count=10 --sort=-committerdate refs/heads/ --format="%(refname:short)"' 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.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 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" alias gprom="git pull --rebase origin master"

1
configs/shared/.gitconfig
View file

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