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

author	Junio C Hamano <redacted>
	Thu, 2 Aug 2018 22:30:44 +0000 (15:30 -0700)
committer	Junio C Hamano <redacted>
	Thu, 2 Aug 2018 22:30:44 +0000 (15:30 -0700)
commit	2b9afea37207323d629953c639542c0e4c87e484
tree	f1006df3853b67d87b9cf7a914424c7c0db15867	tree \| snapshot
parent	87ece7ce1133ebc5d339cad5f6f92c02e5fc712d	commit \| diff
parent	caafecfcf13e58b474c33db093c9deacd11ceb08	commit \| diff

Merge branch 'js/rebase-merge-octopus'

"git rebase --rebase-merges" mode now handles octopus merges as
well.

* js/rebase-merge-octopus:
  rebase --rebase-merges: adjust man page for octopus support
  rebase --rebase-merges: add support for octopus merges
  merge: allow reading the merge commit message from a file

Documentation/git-rebase.txt	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

Documentation/git-rebase.txt	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history