gitconfig: add cp-a/cp-c shortcuts

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 6cdd6a21bd1c7b1c20251f9b21b0987cf8d9138a..52821c7966c2c8a370b450b5fef50bd0f32c08a4 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,7 @@
        name = Mike Frysinger
        email = vapier@gentoo.org
 [color]
+       ui = auto
        diff = auto
        status = auto
 [color "diff"]
@@ -11,7 +12,47 @@
        frag = yellow bold
        whitespace = normal green
        meta = magenta
+[push]
+       default = current
+[alias]
+       a    = add
+       ab   = abandon
+       ar   = archive
+       b    = branch -v
+       bi   = bisect
+       cfg  = config
+       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
+       f    = fetch
+       fp   = format-patch -C -M
+       g    = grep
+       h    = help
+       l    = log
+       m    = merge
+       rb   = rebase --committer-date-is-author-date
+       rb-a = rebase --abort
+       rb-c = rebase --continue
+       rb-i = rebase --interactive
+       rb-s = rebase --skip
+       rl   = rev-list
+       se   = send-email -C -M
+       sm   = submodule
+       st   = status
+       t    = tag
+       up   = upload
+[merge]
+       conflictstyle = diff3
+[rebase]
+       autosquash = true
 [sendemail]
+       chainreplyto = false
+       confirm = always
        suppressfrom = true
        smtpserver = localhost:1111
-#      smtpserver = zeus.spd.analog.com