git-rb-all: handle more edge cases

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f8bfd579b27466817e7af0277803f81cbd281cec..77d72174644af0173e6720d85f84c27bcc1ec1b4 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,15 +28,18 @@
        skip-ensure-authenticated = true
        squash-uploads = false
 
-#[pager]
-#      diff = diff-highlight | less
-#      log  = diff-highlight | less
-#      show = diff-highlight | less
+[pager]
+       diff = diff-highlight | less
+       log  = diff-highlight | less
+       show = diff-highlight | less
 
 [protocol]
        # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
        version = 2
 
+[pull]
+       ff = only
+
 [push]
        default = current
 
@@ -49,12 +52,18 @@
        bi   = bisect
        cfg  = config
        ci   = commit
+       cia  = commit -a
+       ciaf = commit -a --fixup
+       ciam = commit --amend
+       ciaam = commit --amend -a
+       cif  = commit --fixup
        co   = checkout
        cp   = cherry-pick --ff
        cp-a = cherry-pick --abort
        cp-c = cherry-pick --continue
        cp-x = cherry-pick -x
        d    = diff
+       dc   = diff --cached
        desc = describe
        f    = fetch
        fp   = format-patch -C -M
@@ -62,7 +71,7 @@
        h    = help
        l    = log
        lf   = log --format= --name-only
-       m    = merge --log=50 --no-stat
+       m    = merge --log=100 --no-stat
        rb   = rebase
        rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort
@@ -91,6 +100,9 @@
        # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
        fsckobjects = true
 
+[init]
+       defaultBranch = main
+
 [merge "merge-changelog"]
        name = GNU-style ChangeLog merge driver
        driver = /usr/bin/git-merge-changelog %O %A %B
@@ -101,3 +113,6 @@
        suppressfrom = true
        suppresscc = author
        smtpserver = localhost:1111
+       transferEncoding = 8bit
+#      composeencoding = utf-8
+       assume8bitEncoding = 8bit