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)
commit2b9afea...7207323d629953c639542c0e4c87e484
treef1006df...853b67d87b9cf7a914424c7c0db15867copy hash to clipboard (tree)
parent87ece7c...1133ebc5d339cad5f6f92c02e5fc712dcopy hash to clipboard (diff)
parentcaafecf...f13e58b474c33db093c9deacd11ceb08copy hash to clipboard (diff)
Documentation/git-rebase.txt
builtin/merge.c
sequencer.c