Junio C Hamano dc26bd8397 Merge branch 'master' into next ...

* master:
  Update 1.7.8 draft release notes in preparation for rc4
  revert: remove --reset compatibility option
  revert: introduce --abort to cancel a failed cherry-pick
  revert: write REVERT_HEAD pseudoref during conflicted revert
  revert: improve error message for cherry-pick during cherry-pick
  revert: rearrange pick_revisions() for clarity
  revert: rename --reset option to --quit

Conflicts:
	builtin/revert.c

2011-11-22 18:26:19 -08:00

43 KiB

Raw Blame History

View Raw