screen prompt change

[dotfiles] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index c7644b86b15a841003011eaa21e10f5e2907d3ab..2b1c96748cbfcb503609a1f3669d2575eedc3546 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,13 +2,15 @@
        name = James Bunton
        email = jamesbunton@delx.net.au
 [core]
-       pager = less -+F -+X
-       excludesfile = ~/.gitignore
+       pager = less
+       excludesfile = ~/.gitignore_global
+[pager]
+       branch = less -F
+       tag = less -F
 [color]
        ui = auto
 [log]
        decorate = full
-       follow = true
 [diff]
        renamelimit = 10000
        renames = copies
@@ -18,6 +20,8 @@
        default = upstream
 [merge]
        defaultToUpstream = true
+[transfer]
+       fsckObjects = true
 [alias]
        graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
        ci = commit
@@ -36,4 +40,4 @@
        cherry-pick = cherry-pick -x
        branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
        mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
-       expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
\ No newline at end of file
+       expire-prune = !git reflog expire --expire=now --all && git gc --prune=now