This is the first step in making sure that "git rebase --whitespace=fix HEAD~<number>" will never fail. As suggested by Junio, the first step consists in changing "git apply whitespace=fix" to be smarter about previously deleted blank lines at the end of the file. I would be grateful for any feedback on the design decisions and the implementation. Björn Gustavsson (3): apply: Allow blank context lines to match beyond EOF t4124: Add additional tests of --whitespace=fix t3417: Add test cases for "rebase --whitespace=fix" builtin-apply.c | 127 ++++++++++++++++++++++++++++++++------ t/t3417-rebase-whitespace-fix.sh | 126 +++++++++++++++++++++++++++++++++++++ t/t4124-apply-ws-rule.sh | 12 ++++ 3 files changed, 246 insertions(+), 19 deletions(-) create mode 100755 t/t3417-rebase-whitespace-fix.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html