From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 17:06:01 +0000 (-0700)
Subject: Merge branch 'cc/replace-edit'
X-Git-Tag: v2.1.0-rc0~134
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/499168af3b2a21e2d234a2093cb3c0f64e2f36a0

Merge branch 'cc/replace-edit'

"git replace" learns a new "--edit" option.

* cc/replace-edit:
Documentation: replace: describe new --edit option
replace: add --edit to usage string
replace: add tests for --edit
replace: die early if replace ref already exists
replace: refactor checking ref validity
replace: make sure --edit results in a different object
replace: add --edit option
replace: factor object resolution out of replace_object
replace: use OPT_CMDMODE to handle modes
replace: refactor command-mode determination
---

499168af3b2a21e2d234a2093cb3c0f64e2f36a0