]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87ece7c caafecf)
Merge branch 'js/rebase-merge-octopus'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:44 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:44 +0000 (15:30 -0700)
commit2b9afea37207323d629953c639542c0e4c87e484
treef1006df3853b67d87b9cf7a914424c7c0db15867tree | snapshot
parent87ece7ce1133ebc5d339cad5f6f92c02e5fc712dcommit | diff
parentcaafecfcf13e58b474c33db093c9deacd11ceb08commit | 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
Unnamed repository; edit this file 'description' to name the repository.