tree 41fe45b3c1cd2ef3f1b84cc1fdeff14468cd6997
parent 0cc4da303641611e8d9cc431e7b4d3f1a6a0dc86
parent c30e742c4981585061ed52c14abd9ebd32a0e18b
author Junio C Hamano <gitster@pobox.com> 1278526706 -0700
committer Junio C Hamano <gitster@pobox.com> 1278526706 -0700

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