diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
| commit | 0de3a73eb6b36d5b8df82e62dd5679462f19edef (patch) | |
| tree | 5a27d9b14c9768766c8ae81020a5904e0c6a6b36 /interdiff.h | |
| parent | Merge branch 'js/apply-recount-allow-noop' (diff) | |
| parent | status: rebase and merge can be in progress at the same time (diff) | |
| download | tgif-0de3a73eb6b36d5b8df82e62dd5679462f19edef.tar.xz | |
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
Diffstat (limited to 'interdiff.h')
0 files changed, 0 insertions, 0 deletions