diff options
| author |  Nanako Shiraishi <nanako3@lavabit.com> | 2010-01-07 20:05:02 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-07 11:14:39 -0800 |
| commit | 9f21e97ddccf114a6919cf4b8cf57c2838328f36 (patch) | |
| tree | 6096cbd783e73d10ca772012fef8289bce72f22c /builtin-merge-recursive.c | |
| parent | "rebase --onto A...B" replays history on the merge base between A and B (diff) | |
| download | tgif-9f21e97ddccf114a6919cf4b8cf57c2838328f36.tar.xz | |
rebase: fix --onto A...B parsing and add tests
The previous patch didn't parse "rebase --onto A...B" correctly when A
isn't an empty string. It also tried to be careful to notice a case in
which there are more than one merge bases, but forgot to give --all option
to merge-base, making the test pointless.
Fix these problems and add a test script to verify. Improvements to the
script to parse A...B syntax was taken from review comments by Johannes
Schindelin.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions