diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 15cef82..61285ab 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -7,6 +7,10 @@ [init] templatedir = ~/.dotfiles/git/templates [alias] + # meta + # list all aliases + la = "!git config -l | grep alias | cut -c 7-" + delete-merged-branches = "!f() { git checkout --quiet master && git branch --merged | grep --invert-match '\\*' | xargs -n 1 git branch --delete; git checkout --quiet @{-1}; }; f" diff = diff --ignore-space-at-eol -b -w --ignore-blank-lines cnv = commit --no-verify co = checkout @@ -31,6 +35,15 @@ # show what I did today day = "!sh -c 'git log --reverse --no-merges --branches=* --date=local --after=\"yesterday 11:59PM\" --author=\"`git config --get user.name`\"'" + # assume aliases + assume = update-index --assume-unchanged + unassume = update-index --no-assume-unchanged + assumed = "!git ls-files -v | grep ^h | cut -c 3-" + unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged" + + # tag aliases + lt = describe --tags --abbrev=0 + fixup = !sh -c 'git commit --fixup=$1' - squash = !sh -c 'git commit --squash=$1' - ri = rebase --interactive --autosquash