.gitconfig: Add alias `dh` to run diff-highlight

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f5605cf6e2a23511df7f38b87b24a51fb3a154f9..66db0bdc97d085df47c36d6ba06e7b2301396b2d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -105,7 +105,7 @@
   lasttag = describe --tags --abbrev=0
 
   # Latest annotated tag in all branches
-  lasttagged = !git describe --tags `git rev-list --tags --max-count=1`
+  lasttagged = !exec git describe --tags `exec git rev-list --tags --max-count=1`
 
   # List all tags
   tags = tag --list -n1
@@ -114,17 +114,17 @@
   grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
 
   # Edit all files of the given type
-  edit-cached = !"f() { git ls-files --cached | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-others = !"f() { git ls-files --others | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-killed = !"f() { git ls-files --killed | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-modified = !"f() { git ls-files --modified | sort -u ; }; exec `git var GIT_EDITOR` `f`"
-  edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-cached = !"f() { git ls-files --cached | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-others = !"f() { git ls-files --others | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-killed = !"f() { git ls-files --killed | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-modified = !"f() { git ls-files --modified | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+  edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
 
   # Editing and adding conflicted files: when we get many merge conflicts
   # and want to quickly solve them using an editor, then add the  files.
-  edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
   add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec git add `f`"
 
   # Get the current branch name
@@ -144,6 +144,7 @@
        checkin = commit
        ci = commit
        cat = cat-file -p
+       dh = "!f() { git -c color.diff=always diff \"$@\" | perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less; }; f"
        dir = rev-parse --git-dir
        dump = cat-file -p
        file = cat-file -t
@@ -168,6 +169,7 @@
        remotes = remote --verbose
        #root = !exec pwd
        root = rev-parse --show-toplevel
+       status = status --no-short
        st = status --short
        stb = status --short --branch
        sd = show --decorate
@@ -180,11 +182,18 @@
 [color]
        ui = auto
 
+[diff]
+       indentHeuristic = true
+
+[grep]
+       fallbackToNoIndex = true
+
 [include]
        path = ~/lib/config/git/light_bg
 
 [log]
        abbrevCommit = true
+       #mailmap = true
 
 [merge]
        tool = vimdiff
@@ -197,9 +206,22 @@
 [push]
        default = simple
        followTags = true
+       recurseSubmodules = check
 
 [receive]
-       denyNonFastForwards = true
+       #denyCurrentBranch = updateInstead
+       denyDeleteCurrent = true
+       #denyDeletes = true
+       #denyNonFastForwards = true
+
+#[tag]
+#      sort = version:refname
+
+#[transfer]
+#      fsckObjects = true
+
+[user]
+       signingKey = 6E080B70B6287B03
 
 [web]
        browser = webbrowser