| commit | 2d0123ccb9709410e46f352ff7354e9e0f6427b1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Dec 2010 00:51:08 +0000 (9 16:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Dec 2010 00:51:08 +0000 (9 16:51 -0800) | ||
| tree | 0d69fd25c1da1886a95d42ece7e6cc75f77d8c2b | treesnapshot (tar.gz zip) |
| parent | d3b060c6ad574560aa110ad5409306b22f844482 | commitdiff |
| parent | 2f76a26ee707ab72c043148b38dfffb7a63ae516 | commitdiff |
Merge branch 'master' into next
* master:
Documentation/git.txt: update list of maintenance releases
t9143: do not fail when unhandled.log.gz is not created
git-svn: allow the mergeinfo property to be set
* master:
Documentation/git.txt: update list of maintenance releases
t9143: do not fail when unhandled.log.gz is not created
git-svn: allow the mergeinfo property to be set