Support additional git aliases

This commit is contained in:
William Carroll 2017-09-15 11:54:47 -04:00
parent 6bb4d8f043
commit ea10686893
2 changed files with 7 additions and 2 deletions

View file

@ -59,14 +59,17 @@ fi
# 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.yday '! git log --name-only --since=yesterday.midnight --until=today.midnight --author="$(git config --get user.email)"'
git config --global alias.conflicts 'diff --name-only --diff-filter=U'
alias gyday='git log --name-only --since=yesterday.midnight --until=today.midnight --author="$(git config --get user.email)"'
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 gcan='git commit --amend --no-edit'
alias gpf='git push --force'
alias gds='git diff --staged'
alias gfx='git commit --fixup'
# elixir-specific aliases

View file

@ -4,9 +4,10 @@
signingkey = C7A53CC58D3B1F8C
[alias]
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 = ! git log --date=relative --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\"
changed-files =
conflicts = diff --name-only --diff-filter=U
yday = ! git log --name-only --since=yesterday.midnight --until=today.midnight --author=\"$(git config --get user.email)\"
[commit]
gpgsign = true
[gpg]
@ -17,3 +18,4 @@
default = current
[rebase]
autosquash = true
autostash = true