diff --git a/home/.config/git/config b/home/.config/git/config index 3538bd3..0eb5e4f 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -51,6 +51,8 @@ set-upstream = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`" + stash-staged = "!sh -c 'git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}'" + find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'" [credential]