diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:26 -0700 |
| commit | a4da3388fd83e4b31273d71bebf8a92becd8f60c (patch) | |
| tree | 1d86a52290e732be24076f875203f82941e1e500 /t/t6027-merge-binary.sh | |
| parent | Merge branch 'maint' of https://github.com/git-l10n/git-po (diff) | |
| parent | rebase -i continue: don't skip commits that only change submodules (diff) | |
| download | tgif-a4da3388fd83e4b31273d71bebf8a92becd8f60c.tar.xz | |
Merge branch 'jk/rebase-i-submodule-conflict-only' into maint
Giving "--continue" to a conflicted "rebase -i" session skipped a
commit that only results in changes to submodules.
By John Keeping
* jk/rebase-i-submodule-conflict-only:
rebase -i continue: don't skip commits that only change submodules
Diffstat (limited to 't/t6027-merge-binary.sh')
0 files changed, 0 insertions, 0 deletions