display raw control chars in pager output

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 56ae58f963853d77ffbbaa4530b463b7fb352b7a..5ba6ea4f934cd287de507140df2e194dc4552fc2 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,9 +3,9 @@
        email = madduck@madduck.net
        signingkey = 330c4a75
 [core]
        email = madduck@madduck.net
        signingkey = 330c4a75
 [core]

-       pager = cat
-[gui]
-       fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+       pager = "less -Fr"
+[diff]
+       renames = copies

 [alias]
        restore = checkout HEAD
        dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"
 [alias]
        restore = checkout HEAD
        dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"


@@ -14,7 +14,12 @@
        ci = commit -a
        stat = status
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
        ci = commit -a
        stat = status
        files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard

-       returnto = "!git add . && git commit -m'stowing away trash' >/dev/null && d=$(date +%Y.%m.%d.%H.%M.%S) && git tag trash/$d && echo tagged unwanted worktree $(git rev-parse --short HEAD) with trash/$d && git reset --hard HEAD^ >/dev/null && git reset --hard"

 [clean]
        requireForce = true
 [clean]
        requireForce = true

-
+[branch]
+       autosetupmerge = true
+       autosetuprebase = remote
+[merge]
+       tool = vimdiff
+[gui]
+       fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0