diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:16:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:16:16 -0700 |
| commit | 64630d807ae0a9717ae39c87bd1458bf15c62142 (patch) | |
| tree | ab4955b7e70e14600028aa4f7fd0d99f5579452a /Documentation/asciidoc.conf | |
| parent | Merge branch 'maint-1.9' into maint (diff) | |
| parent | rebase--merge: fix --skip with two conflicts in a row (diff) | |
| download | tgif-64630d807ae0a9717ae39c87bd1458bf15c62142.tar.xz | |
Merge branch 'bc/fix-rebase-merge-skip' into maint
During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
Diffstat (limited to 'Documentation/asciidoc.conf')
0 files changed, 0 insertions, 0 deletions