Merge branch 'wsr' of github.com:hjp/dot into wsr

This commit is contained in:
Peter J. Holzer 2018-01-12 00:05:34 +01:00
commit bb68db30cd
1 changed files with 5 additions and 1 deletions

View File

@ -10,4 +10,8 @@
type = cat-file -t type = cat-file -t
dump = cat-file -p dump = cat-file -p
[push] [push]
default = upstream # 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