gitconfig: add aliases for reset and rebase

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index a6b1633ea00084c79422e257c569d32b9d14a837..62e26f1ab01f2b98a122b187f97148cb17a52fb6 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -68,9 +68,10 @@
        cad = commit --verbose --amend --date=
        d   = diff
        dw  = diff --color-words
+       ds  = diff --stat
        dc  = diff --cached
        dcw = diff --cached --color-words
-       ds  = diff --stat
+       dcs = diff --cached --stat
        g   = grep
        s   = status
        l   = log
@@ -80,11 +81,17 @@
        a   = add
        ap  = add --patch
        au  = add --update
+       rs  = reset
+       rsh = reset --hard
+       rsp = reset --patch
        ## Branches.
        co  = checkout
        b   = branch -a -v
        m   = merge
        mo  = merge origin/master
+       re  = rebase
+       rei = rebase --interactive
+       rec = rebase --continue
        ## Remote.
        f   = fetch
        t   = tag