tree 5a27d9b14c9768766c8ae81020a5904e0c6a6b36
parent bda53f4185b8f7d2197176fe83afcb8d5f47368b
parent 982288e9bda8ea8587b8afef63eb3424b047a018
author Junio C Hamano <gitster@pobox.com> 1542533036 +0900
committer Junio C Hamano <gitster@pobox.com> 1542533036 +0900

Merge branch 'js/rebase-r-and-merge-head'

Bugfix for the recently graduated "git rebase --rebase-merges".

* js/rebase-r-and-merge-head:
  status: rebase and merge can be in progress at the same time
  built-in rebase --skip/--abort: clean up stale .git/<name> files
  rebase -i: include MERGE_HEAD into files to clean up
  rebase -r: do not write MERGE_HEAD unless needed
  rebase -r: demonstrate bug with conflicting merges