custom-chroot: do not init /root if a git repo is there

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index a1e34030c91e52d6874d48c7de7b2819216fc432..9dcfea20b5bed429fe9b5da7ea44b42f974559c6 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,20 +18,25 @@
        a    = add
        ab   = abandon
        ar   = archive
-       b    = branch
+       b    = branch -v
        bi   = bisect
        cfg  = config
        ci   = commit
        co   = checkout
-       cp   = cherry-pick
+       cp   = cherry-pick --ff
+       cp-a = cherry-pick --abort
+       cp-c = cherry-pick --continue
+       cp-x = cherry-pick -x
        d    = diff
        desc = describe
        dl   = download
        f    = fetch
-       fp   = format-patch
+       fp   = format-patch -C -M
+       g    = grep
+       h    = help
        l    = log
        m    = merge
-       rb   = rebase
+       rb   = rebase --committer-date-is-author-date
        rb-a = rebase --abort
        rb-c = rebase --continue
        rb-i = rebase --interactive
@@ -46,7 +51,11 @@
        conflictstyle = diff3
 [rebase]
        autosquash = true
+[merge "merge-changelog"]
+       name = GNU-style ChangeLog merge driver
+       driver = /usr/bin/git-merge-changelog %O %A %B
 [sendemail]
        chainreplyto = false
+       confirm = always
        suppressfrom = true
        smtpserver = localhost:1111