use less -F as pager

[etc/git.git] / .gitconfig

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

-       pager = cat
+       pager = "less -F"

 [gui]
        fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [alias]
 [gui]
        fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [alias]


@@ -14,7 +14,7 @@
        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