diff options
| author |  Björn Gustavsson <bgustavsson@gmail.com> | 2010-03-06 15:31:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-06 23:53:00 -0800 |
| commit | 59f5ced65b46370a121916593cce7fcd210a15df (patch) | |
| tree | d0cb93ec797976e9ef27e10dad6aa4ce5de9f908 /builtin/merge-ours.c | |
| parent | t4124: Add additional tests of --whitespace=fix (diff) | |
| download | tgif-59f5ced65b46370a121916593cce7fcd210a15df.tar.xz | |
t3417: Add test cases for "rebase --whitespace=fix"
The command "git rebase --whitespace=fix HEAD~<N>" is supposed to
only clean up trailing whitespace, and the expectation is that it
cannot fail.
Unfortunately, if one commit adds a blank line at the end of a file
and a subsequent commit adds more non-blank lines after the blank
line, "git apply" (used indirectly by "git rebase") will fail to apply
the patch of the second commit.
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions