author | Junio C Hamano <junkio@cox.net> | |
Sun, 19 Jun 2005 20:17:50 +0000 (13:17 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Mon, 20 Jun 2005 03:13:18 +0000 (20:13 -0700) | ||
commit | 366175ef8c3b1e145f4ba846e63a1dea3ec3cacc | |
tree | bb4a2e04362c038ee2f8d6b77e5bdb9f4223dfea | tree | snapshot |
parent | 232b75ab3d60475b19270be022a966772c25c84b | commit | diff |
[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>
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>
Documentation/diffcore.txt | diff | blob | history | |
diff.c | diff | blob | history | |
diffcore-break.c | diff | blob | history | |
t/t4008-diff-break-rewrite.sh | diff | blob | history |