diff --git a/gitconfig b/gitconfig index a082a48..07edb89 100644 --- a/gitconfig +++ b/gitconfig @@ -25,6 +25,7 @@ cols = !git checkout $(git branch | fzf) cp = cherry-pick cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn" + cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn" cpls = !git cp $(git ls) d = diff dls = !git diff $(git branch | fzf) @@ -78,8 +79,9 @@ st = stash sy = !gitsha1yank -s sum = show --stat - undo = reset --soft HEAD^ sshp = stash show -p + undo = reset --soft HEAD^ + wip = !git add . && git commit -m 'WIP' [user] email = rob@netflux.io name = Rob Watson