Merge branch 'master' into wsr
This commit is contained in:
commit
0d49086578
|
@ -15,3 +15,10 @@
|
|||
# nothing is inconvenient, matching is dangerous.
|
||||
# current is only compatible remaining option.
|
||||
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