git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Sun, 27 Jul 2014 22:14:18 +0000 (15:14 -0700)
committer	Junio C Hamano <redacted>
	Sun, 27 Jul 2014 22:14:18 +0000 (15:14 -0700)
commit	16737445a94cb9b18378fff973129d974c7cdf8a
tree	44fe2074f4d4f146581e33e6d4b15bb9740c0b10	tree \| snapshot
parent	4799593e26f09e4209249caf9536001036618ac2	commit \| diff
parent	3fa102590758594e3df45c58caba945894a608e5	commit \| diff

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

Documentation/git-replace.txt	diff1 \|	diff2 \|	blob \| history
builtin/replace.c	diff1 \|	diff2 \|	blob \| history
commit.c	diff1 \|	diff2 \|	blob \| history
commit.h	diff1 \|	diff2 \|	blob \| history