diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
| commit | 551d75dbd80cb6af08376ea8a12bdaa3f5860f35 (patch) | |
| tree | 006ba5c9799ef415c5531bfd122f0899823b351a /archive.c | |
| parent | bc50897b90177f03c74e53467d1b62aec74789c5 (diff) | |
| parent | 924aaf3ef764a5e8e976f68e024ecacf54ff6306 (diff) | |
| download | git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.tar.gz git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.tar.xz | |
Merge branch 'rj/config-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
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions