| commit | 16737445a94cb9b18378fff973129d974c7cdf8a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:14:18 +0000 (27 15:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:14:18 +0000 (27 15:14 -0700) | ||
| tree | 44fe2074f4d4f146581e33e6d4b15bb9740c0b10 | treesnapshot (tar.gz zip) |
| parent | 4799593e26f09e4209249caf9536001036618ac2 | commitdiff |
| parent | 3fa102590758594e3df45c58caba945894a608e5 | commitdiff |
Merge branch 'cc/replace-graft'
"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 |