Changes relative to v2: - it works now not by chance, but by design, - empty lines are interpreted as if they contained a single space, - it works when adding lines to the beginning or end of a file, and - the apply option has been renamed to --recount, as per Junio's request. Johannes Schindelin (2): Allow git-apply to ignore the hunk headers (AKA recountdiff) git-add: introduce --edit (to edit the diff vs. the index) Documentation/git-add.txt | 13 ++++- Documentation/git-apply.txt | 7 ++- builtin-add.c | 55 ++++++++++++++++++- builtin-apply.c | 64 ++++++++++++++++++++-- t/t3702-add-edit.sh | 126 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 257 insertions(+), 8 deletions(-) create mode 100755 t/t3702-add-edit.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
