Merge branch 'pw/rebase-i-keep-reword-after-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
commitd349e18...abb88879f4c2cae9f089509b25606928
tree461e219...92cc27c2474b881d13c769bc773aa89dcopy hash to clipboard (tree)
parent6dcd364...3a20e90d02463de5fe33eb94c4c33fa6copy hash to clipboard (diff)
parenta9279c6...8588a12485a8afa424036bdb5ad0534dcopy hash to clipboard (diff)
sequencer.c