.gitconfig: fix a bug in alias

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 598af7be712d6828a716ab612e6cf2cf2c106bdd..3ec2ca05f54a90d0bb9b19030895b8c06467c29b 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,6 @@
 [alias]
        b = branch
+       branches = branch -a
        camend = commit --amend -C HEAD
        checkin = commit
        ci = commit
@@ -16,10 +17,14 @@
        lr = log --decorate --reverse
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
-       root = rev-parse --show-toplevel
+       null-merge = merge --strategy=ours
+       remotes = remote -v
+       ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}' -"
        #root = !pwd
+       root = rev-parse --show-toplevel
        st = status --short
        stb = status --short --branch
+       tags = tag -l
        unstage = reset HEAD --
        wdiff = diff --word-diff
        wshow = show --word-diff --decorate