.gitconfig: add aliases

branches, null-merge, remotes, ri, tags

diff --git a/.gitconfig b/.gitconfig
index 598af7be712d6828a716ab612e6cf2cf2c106bdd..38d9c5c93eaa567bf3ea74cc6c00ac4c8b98e073 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
+       null-merge = merge --strategy=ours
+       remotes = remote -v
+       ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u}\"}' -"
        root = rev-parse --show-toplevel
        #root = !pwd
        st = status --short
        stb = status --short --branch
+       tags = tag -l
        unstage = reset HEAD --
        wdiff = diff --word-diff
        wshow = show --word-diff --decorate