| commit | f7d0e5b619f68bdcbcbdd8b3afc56af016698f95 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Jul 2009 20:03:16 +0000 (19 13:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Jul 2009 20:03:16 +0000 (19 13:03 -0700) | ||
| tree | e2acfc22553c4d50a645d6b338e5b6ee6b8d8c5f | treesnapshot (tar.gz zip) |
| parent | d04065c9abbb02778090da06956df5115a44aa50 | commitdiff |
| parent | 77acc32b29990a76ac6a63d3211b7c70adcef64d | commitdiff |
Merge branch 'master' into next
* master:
Updates to draft release notes to 1.6.4
push: do not give big warning when no preference is configured
t4202-log.sh: Test git log --no-walk sort order
cvsexportcommit: reorder tests to quiet intermittent failure
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
Conflicts:
environment.c
* master:
Updates to draft release notes to 1.6.4
push: do not give big warning when no preference is configured
t4202-log.sh: Test git log --no-walk sort order
cvsexportcommit: reorder tests to quiet intermittent failure
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
Conflicts:
environment.c
| cache.h | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |
| refs.c | diff1 | diff2 | blobhistory |