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

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 50980b7e67a7892066bf9e65b34ed695d117a524..9dcfea20b5bed429fe9b5da7ea44b42f974559c6 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,6 +24,9 @@
        ci   = commit
        co   = checkout
        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
@@ -48,6 +51,9 @@
        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