Here is a small 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 v5, thanks to Junio, are:
- new patch 1/10 to clean up redirection style in t6050
- new patches 8/10, 9/10 and 10/10 to check mergetags
- add functions to test parents in patch 3/10 and 7/10
- improve testing signed commits in patch 7/10
- improve warning when removing commit signature in
patch 6/10
Christian Couder (10):
replace: cleanup redirection style in tests
replace: add --graft option
replace: add test for --graft
Documentation: replace: add --graft option
contrib: add convert-grafts-to-replace-refs.sh
replace: remove signature when using --graft
replace: add test for --graft with signed commit
commit: add for_each_mergetag()
replace: check mergetags when using --graft
replace: add test for --graft with a mergetag
Documentation/git-replace.txt | 10 +++
builtin/replace.c | 126 +++++++++++++++++++++++++++-
commit.c | 47 +++++++++++
commit.h | 7 ++
contrib/convert-grafts-to-replace-refs.sh | 28 +++++++
log-tree.c | 15 +---
t/t6050-replace.sh | 135 ++++++++++++++++++++++++------
7 files changed, 332 insertions(+), 36 deletions(-)
create mode 100755 contrib/convert-grafts-to-replace-refs.sh
--
2.0.0.421.g786a89d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
