diff --git a/gitconfig b/gitconfig index e7c7f4c..c192ed1 100644 --- a/gitconfig +++ b/gitconfig @@ -67,9 +67,7 @@ rc = rebase --continue re = rebase rels = !git rebase $(git branch | fzf) - rh = reset --hard ri = rebase -i --autosquash - rils = !git rebase -i --autosquash $(git branch | fzf) rom = !sh -c 'git fetch && git rebase origin/$(git mainbranch)' rr = !sh -c 'git fetch && git reset --hard $(git rb)' rv = revert @@ -85,6 +83,7 @@ sqt = merge --squash -s recursive -X theirs ss = stash save st = stash + stus = stash --keep-index -u sy = !gitsha1yank -s sum = show --stat sshp = stash show -p