diff --git a/gitconfig b/gitconfig index ce33a46..a458155 100644 --- a/gitconfig +++ b/gitconfig @@ -19,8 +19,9 @@ cl = clone cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' -- co = checkout - cob = !git checkout $(git branch | fzf) + cols = !git checkout $(git branch | fzf) cp = cherry-pick + cpls = !git cp $(git ls) d = diff dom = diff origin/master drb = !git diff $(git rb) @@ -59,6 +60,7 @@ shp = show -p sl = stash list sq = merge --squash + sqls = !git sq $(git ls) sqt = merge --squash -s recursive -X theirs ss = stash save st = status