diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-19 20:17:50 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 03:13:18 (GMT) |
| commit | 366175ef8c3b1e145f4ba846e63a1dea3ec3cacc (patch) | |
| tree | bb4a2e04362c038ee2f8d6b77e5bdb9f4223dfea /apply.c | |
| parent | 232b75ab3d60475b19270be022a966772c25c84b (diff) | |
| download | git-366175ef8c3b1e145f4ba846e63a1dea3ec3cacc.zip git-366175ef8c3b1e145f4ba846e63a1dea3ec3cacc.tar.gz git-366175ef8c3b1e145f4ba846e63a1dea3ec3cacc.tar.bz2 | |
[PATCH] Rework -B output.
Patch for a completely rewritten file detected by the -B flag
was shown as a pair of creation followed by deletion in earlier
versions. This was an misguided attempt to make reviewing such
a complete rewrite easier, and unnecessarily ended up confusing
git-apply. Instead, show the entire contents of old version
prefixed with '-', followed by the entire contents of new
version prefixed with '+'. This gives the same easy-to-review
for human consumer while keeping it a single, regular
modification patch for machine consumption, something that even
GNU patch can grok.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions