tigrc: ignore case when searching

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 448000a3c431d301284206599c39b2ab2727c050..f54be46c38c9ea7714b6cf37f65df5d46eeec535 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -66,6 +66,7 @@
        dc  = diff --cached
        dcw = diff --cached --color-words
        ds  = diff --stat
+       g   = grep
        s   = status
        l   = log
        ls  = log --stat
@@ -109,8 +110,8 @@
        ss  = stash save
        ssk = stash save --keep-index
        ssu = stash save --include-untracked
-       sa  = stash apply
-       sp  = stash pop
+       sa  = stash apply --index
+       sp  = stash pop --index
 
        ## Custom commands.
        #
@@ -150,7 +151,7 @@
        renames = copy
 
        # Diff algorithm to use.
-       algorithm = patience
+       algorithm = histogram
 
        # Change the definition of a word as used by diff --color-words to be
        # shorter (not only spaces) and thus simplify the generated diffs.
@@ -160,7 +161,7 @@
        # changes to non-word characters are shown character wise (e.g. from
        # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
        # addition. See t/ for some tests and examples.
-       wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+       wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Allow diffing of some binary files.
 #
@@ -174,6 +175,10 @@
 [diff "sqlite"]
        textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
+[log]
+       # Display branches/tag names in log (same as log's --decorate option).
+       decorate = short
+
 [merge]
        tool = vimdiff