]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bda53f4 982288e)
Merge branch 'js/rebase-r-and-merge-head'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:56 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:56 +0000 (18:23 +0900)
commit0de3a73eb6b36d5b8df82e62dd5679462f19edef
tree5a27d9b14c9768766c8ae81020a5904e0c6a6b36tree | snapshot
parentbda53f4185b8f7d2197176fe83afcb8d5f47368bcommit | diff
parent982288e9bda8ea8587b8afef63eb3424b047a018commit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.