]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0cc4da3 c30e742)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 18:18:26 +0000 (11:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 18:18:26 +0000 (11:18 -0700)
commitfcd91f8de20bf7969599a7a60cba73117d99f2d1
tree41fe45b3c1cd2ef3f1b84cc1fdeff14468cd6997tree | snapshot
parent0cc4da303641611e8d9cc431e7b4d3f1a6a0dc86commit | diff
parentc30e742c4981585061ed52c14abd9ebd32a0e18bcommit | diff
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
builtin/rev-parse.c diff1 | diff2 | blob | history
refs.c diff1 | diff2 | blob | history
t/t1502-rev-parse-parseopt.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.