~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
el/dot-emacs.el: Colours for `magit' things.
[profile]
/
dot
/
gitconfig.in
diff --git
a/dot/gitconfig.in
b/dot/gitconfig.in
index
f39a5fa
..
106e2a9
100644
(file)
--- a/
dot/gitconfig.in
+++ b/
dot/gitconfig.in
@@
-4,6
+4,7
@@
[core]
filemode = true
excludesfile = @profile@/git/gitignore
[core]
filemode = true
excludesfile = @profile@/git/gitignore
+ attributesfile = @profile@/git/attributes
[user]
name = Mark Wooding
[user]
name = Mark Wooding
@@
-19,19
+20,23
@@
[diff]
renames = copies
[diff]
renames = copies
+ wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
[diff "lisp"]
[diff "lisp"]
- xfuncname = "^\\s*\\(def.*$"
+ xfuncname = "^((\\(|\\s*\\(def).*$)"
+
+[log]
+ date = rfc
+ decorate = true
+
+[rebase]
+ autosquash = true
[format]
headers = "Organization: Straylight/Edgeware\n"
[color]
[format]
headers = "Organization: Straylight/Edgeware\n"
[color]
- diff = auto
- status = auto
- branch = auto
- interactive = auto
- grep = auto
+ ui = auto
[color "diff"]
plain = normal
[color "diff"]
plain = normal
@@
-42,10
+47,10
@@
whitespace = reverse red
[color "interactive"]
whitespace = reverse red
[color "interactive"]
-
prompt = bold yellow
-
header = bold
-
help = green
-
error = bold red
+ prompt = bold yellow
+ header = bold
+ help = green
+ error = bold red
[color "status"]
header = bold
[color "status"]
header = bold
@@
-64,6
+69,7
@@
[alias]
egrep = "grep -E"
patch = "format-patch -o p -s"
[alias]
egrep = "grep -E"
patch = "format-patch -o p -s"
+ graph = "log --pretty=oneline --abbrev-commit --graph"
release = !"sh -e -c ' \
[ $# -gt 0 ] || { \
echo >&2 \"usage: git release TAG [OPTS]\"; \
release = !"sh -e -c ' \
[ $# -gt 0 ] || { \
echo >&2 \"usage: git release TAG [OPTS]\"; \
@@
-93,6
+99,7
@@
[rerere]
enabled = yes
[rerere]
enabled = yes
+ autoupdate = yes
[stgit]
autoresolved = yes
[stgit]
autoresolved = yes