Merge branch 'wsr' of tsimri.wsr.ac.at:dot into wsr
Conflicts: .gitconfig
This commit is contained in:
commit
a4a0a8a23e
|
@ -10,4 +10,8 @@
|
||||||
type = cat-file -t
|
type = cat-file -t
|
||||||
dump = cat-file -p
|
dump = cat-file -p
|
||||||
[push]
|
[push]
|
||||||
|
# 1.7.1: nothing, matching, tracking, current
|
||||||
|
# 2.11.0: nothing, matching, upstream, current, simple
|
||||||
|
# nothing is inconvenient, matching is dangerous.
|
||||||
|
# current is only compatible remaining option.
|
||||||
default = current
|
default = current
|
||||||
|
|
Loading…
Reference in New Issue