.gitconfig: fix a bug in alias

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 17c893cb8649d011724a991c10eedfdf20e45625..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
@@ -30,65 +35,8 @@
 [color]
        ui = auto
 
-# Adapted from http://shallowsky.com/blog/programming/gitcolors.html
-# and http://www.ansdb.com/649-git-colors-for-light-background
-[color "branch"]
-#      -- default --
-#      current = green
-#      local = normal
-#      plain = normal
-#      remote = magenta
-#      -- light bg --
-       current = blue
-       local = normal
-       plain = normal
-       remote = magenta
-       upstream = normal
-[color "diff"]
-#      -- default --
-#      commit = bold yellow
-#      frag = cyan
-#      meta = cyan
-#      new = green
-#      old = magenta
-#      plain = normal
-#      whitespace = normal red
-#      -- light bg --
-       commit = normal bold
-       frag = cyan
-       meta = bold
-       new = blue
-       old = magenta
-       plain = normal
-       whitespace = normal red
-#[color "grep"]
-#      -- default --
-#      match = normal
-[color "decorate"]
-#      -- light bg --
-       HEAD = blue
-       tag = blue
-#[color "interactive"]
-#      -- default --
-#      error = normal
-#      header = normal
-#      help = normal
-#      prompt = normal
-[color "status"]
-#      -- default --
-#      added = cyan
-#      changed = magenta
-#      header = normal
-#      nobranch = red
-#      untracked = red
-#      updated = green
-#      -- light bg --
-       added = blue
-       changed = blue
-       header = normal
-       nobranch = red
-       untracked = red
-       updated = magenta
+[include]
+       path = ~/lib/config/git/light_bg
 
 [log]
        abbrevCommit = true