| commit | 9b14090315a13c818aa7b29fce22e7c48eaaa682 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2014 18:02:26 +0000 (22 11:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2014 18:02:27 +0000 (22 11:02 -0700) | ||
| tree | 1824335a21e4679c21d2fbebf92891f1bf483460 | treesnapshot (tar.gz zip) |
| parent | 76482939ecca84ff22727a4c117fb09794efaa0e | commitdiff |
| parent | 3fa102590758594e3df45c58caba945894a608e5 | commitdiff |
Merge branch 'cc/replace-graft' into next
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* cc/replace-graft:
replace: add test for --graft with a mergetag
replace: check mergetags when using --graft
replace: add test for --graft with signed commit
replace: remove signature when using --graft
contrib: add convert-grafts-to-replace-refs.sh
Documentation: replace: add --graft option
replace: add test for --graft
replace: add --graft option
replace: cleanup redirection style in tests
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* cc/replace-graft:
replace: add test for --graft with a mergetag
replace: check mergetags when using --graft
replace: add test for --graft with signed commit
replace: remove signature when using --graft
contrib: add convert-grafts-to-replace-refs.sh
Documentation: replace: add --graft option
replace: add test for --graft
replace: add --graft option
replace: cleanup redirection style in tests
| Documentation/git-replace.txt | diff1 | diff2 | blobhistory |
| builtin/replace.c | diff1 | diff2 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |
| commit.h | diff1 | diff2 | blobhistory |