[PATCH v2 0/4] Add --graft option to git replace
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Jun 1, 2014, 15:10 UTC
- Message-ID
- <20140601150409.15428.27017.chriscool@tuxfamily.org>
Here is a small patch series to implement:
git replace [-f] --graft <commit> [<parent>...]
This patch series goes on top of the patch series that implements --edit.
The changes since v1 are the following thanks to Eric, Junio and Peff:
- change commit message of patch 1/4 - added patch 4/4 that was previously sent separately - in patch 4/4 rename the existing grafts file into grafts.bak
Christian Couder (4): replace: add --graft option replace: add test for --graft Documentation: replace: add --graft option contrib: add convert-grafts-to-replace-refs.sh
Documentation/git-replace.txt | 10 ++++ builtin/replace.c | 84 ++++++++++++++++++++++++++++++- contrib/convert-grafts-to-replace-refs.sh | 29 +++++++++++ t/t6050-replace.sh | 12 +++++ 4 files changed, 134 insertions(+), 1 deletion(-) create mode 100755 contrib/convert-grafts-to-replace-refs.sh
-- 2.0.0.rc0.40.gd30ccc4