hjp
/
dot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wsr' of tsimri.wsr.ac.at:dot into wsr 

Conflicts:
	.gitconfig
This commit is contained in:
Peter J. Holzer 2018-01-12 23:40:33 +01:00
parent 243d5b2d39 bb68db30cd
commit a4a0a8a23e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@ -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