--- /dev/null
+
+[user]
+ name = Steve Youngs
+ email = steve@steveyoungs.com
+[color]
+ pager = true
+ ui = auto
+[core]
+ pager = less
+ editor = vi
+[alias]
+ ci = commit
+ cam = commit -sam
+ sam = commit -sam
+ cwl = !git commit -sF $(git rev-parse --show-toplevel)/++log
+ cawl = !git commit -saF $(git rev-parse --show-toplevel)/++log
+ mm = merge -S --no-ff --log -m
+ Ecam = commit --edit -sam
+ Esam = commit --edit -sam
+ Ecwl = !git commit --edit -sF $(git rev-parse --show-toplevel)/++log
+ Ecawl = !git commit --edit -saF $(git rev-parse --show-toplevel)/++log
+ Emm = merge --edit -S --no-ff --log -m
+ mirror = push origin master
+ tagpush = push --tags origin master
+ alias = config --get-regexp ^alias
+ co = checkout
+ cb = switch
+ nb = switch -c
+ nt = switch -t origin/master -c
+ cob = switch -c
+ bi = bisect
+ rbi = rebase -i
+ prb = pull --rebase
+ fp = format-patch --minimal -o ${HOME}/upload origin/master
+ fpc = format-patch --minimal --cover-letter -o ${HOME}/upload origin/master
+ sp = send-email ${HOME}/upload
+ spc = send-email --compose ${HOME}/upload
+ wb = rev-parse --abbrev-ref HEAD
+ ll = log --oneline
+[format]
+ numbered = auto
+ subjectprefix = Patch
+[sendemail]
+ suppresscc = all
+
+[rerere]
+ enabled = true
+ autoUpdate = true
+[merge "sxepkg"]
+ driver = true
+[diff "cpp"]
+ xfuncname = "!^[ \\t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n^((::[[:space:]]*)?[A-Za-z_][A-Za-z_0-9]*[[:space:]]*\\(.*)$\n^((#define[[:space:]]|DEFUN).*)$"
+[diff "elisp"]
+ xfuncname = ^\\([^[:space:]]*def[^[:space:]]+[[:space:]]+([^()[:space:]]+)
+[diff "texinfo"]
+ xfuncname = ^@node[[:space:]]+([^,[:space:]][^,]+)
+[transfer]
+ fsckObjects = true
+++ /dev/null
-[user]
- name = Steve Youngs
- email = steve@steveyoungs.com
-[color]
- pager = true
- ui = auto
-[core]
- pager = less
- editor = nano -w
-[alias]
- cwl = !git commit -sF $(git rev-parse --show-toplevel)/++log
- cawl = !git commit -saF $(git rev-parse --show-toplevel)/++log
- alias = config --get-regexp ^alias
- co = checkout
- cob = checkout -b
- ci = commit
- cam = commit -sam
- bi = bisect
- rbi = rebase -i
- curb = rev-parse --abbrev-ref HEAD