default = current
[alias]
a = add
- b = branch
+ ab = abandon
+ ar = archive
+ b = branch -v
bi = bisect
+ cfg = config
ci = commit
co = checkout
- cp = cherry-pick
+ cp = cherry-pick --ff
+ 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
rb-s = rebase --skip
rl = rev-list
- se = send-email
+ 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