Merge branch 'master' into wsr_shared
This commit is contained in:
commit
eea9e7b27d
|
@ -12,3 +12,10 @@
|
||||||
# nothing is inconvenient, matching is dangerous.
|
# nothing is inconvenient, matching is dangerous.
|
||||||
# current is only compatible remaining option.
|
# current is only compatible remaining option.
|
||||||
default = current
|
default = current
|
||||||
|
[color "diff"]
|
||||||
|
# Display commit ids blue on white.
|
||||||
|
# Default is yellow on normal which is unreadable with a light
|
||||||
|
# background
|
||||||
|
commit = blue white
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
Loading…
Reference in New Issue