| commit | 6da4aa565696d7af7bc41d274d3e0c24ef9fff79 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jul 2011 18:52:45 +0000 (1 11:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jul 2011 18:52:45 +0000 (1 11:52 -0700) | ||
| tree | 3a6c0e651876d6f0d4dded9472956da5169231a9 | treesnapshot (tar.gz zip) |
| parent | 81bc0a7a052cfcb9bdf2d9d8940db0dfdd8541ed | commitdiff |
| parent | 924aaf3ef764a5e8e976f68e024ecacf54ff6306 | commitdiff |
Merge branch 'rj/config-cygwin' into next
* 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
* 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