projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc50897
924aaf3
)
Merge branch 'rj/config-cygwin'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000
(14:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 13 Jul 2011 21:31:36 +0000
(14:31 -0700)
* rj/config-cygwin:
config.c: Make git_config() work correctly when called recursively
t1301-*.sh: Fix the 'forced modes' test on cygwin
help.c: Fix detection of custom merge strategy on cygwin
Trivial merge