crostini-vapier-setup: install edge

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 19d575c8ec912c18718bd78f29107b2b7ea116df..61f69994a51fa3033adfeaee13aba1c2b83cccf3 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,10 +28,10 @@
        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
@@ -42,7 +42,6 @@
 
 [alias]
        a    = add
-       ab   = abandon
        am-a = am --abort
        am-c = am --continue
        ar   = archive
@@ -57,13 +56,13 @@
        cp-x = cherry-pick -x
        d    = diff
        desc = describe
-       dl   = download
        f    = fetch
        fp   = format-patch -C -M
        g    = grep
        h    = help
        l    = log
-       m    = merge
+       lf   = log --format= --name-only
+       m    = merge --log=100 --no-stat
        rb   = rebase
        rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort
@@ -75,7 +74,6 @@
        sm   = submodule
        st   = status
        t    = tag
-       up   = upload
 
 [tag]
        sort = version:refname
@@ -93,6 +91,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
@@ -103,3 +104,6 @@
        suppressfrom = true
        suppresscc = author
        smtpserver = localhost:1111
+       transferEncoding = 8bit
+#      composeencoding = utf-8
+       assume8bitEncoding = 8bit