| commit | fcd91f8de20bf7969599a7a60cba73117d99f2d1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 18:18:26 +0000 (7 11:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 18:18:26 +0000 (7 11:18 -0700) | ||
| tree | 41fe45b3c1cd2ef3f1b84cc1fdeff14468cd6997 | treesnapshot (tar.gz zip) |
| parent | 0cc4da303641611e8d9cc431e7b4d3f1a6a0dc86 | commitdiff |
| parent | c30e742c4981585061ed52c14abd9ebd32a0e18b | commitdiff |
Merge branch 'maint'
* maint:
backmerge a few more fixes to 1.7.1.X series
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
fix git branch -m in presence of cross devices
Conflicts:
RelNotes
builtin/rev-parse.c
* maint:
backmerge a few more fixes to 1.7.1.X series
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
fix git branch -m in presence of cross devices
Conflicts:
RelNotes
builtin/rev-parse.c
| builtin/rev-parse.c | diff1 | diff2 | blobhistory |
| refs.c | diff1 | diff2 | blobhistory |
| t/t1502-rev-parse-parseopt.sh | diff1 | diff2 | blobhistory |