{"thread":{"id":"28165","subject":"git diff --word-diff=plain","startedAt":"2011-08-19T19:16:52Z","lastAt":"2011-08-19T19:16:52Z","messageCount":1,"participants":["Elias Pipping"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"173877","messageId":"20110819.211652.1683659708096792687.pipping@lavabit.com","threadId":"28165","inReplyTo":null,"subject":"git diff --word-diff=plain","fromName":"Elias Pipping","fromEmail":"pipping@lavabit.com","sentAt":"2011-08-19T19:16:52Z","receivedAt":"2011-08-19T19:16:52Z","isPatch":false,"sender":{"key":"pipping@lavabit.com","avatar":null},"body":"Hello,\n\nI mean to use `git --no-pager diff --word-diff=plain --no-index` as a\n`wdiff`-replacement. I'm not sure if I should call it a bug but I've\ncome across a situation in which the output of GNU wdiff is by far\nmore helpful than that of the aforementioned git command.\n\nI've attached the two files less and BSD-2. Here are the differences\nthat wdiff reveals:\n\n% wdiff less BSD-2\n                          [-Less License-]\n[-                          -------------]\n[--]\n[-Less-]Copyright [-(C) 1984-2005  Mark Nudelman-] {+(c) <YEAR>, <OWNER>+}\n{+All rights reserved.+}\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice,\n   this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   [-notice-]\n   {+notice, this list of conditions and the following disclaimer+} in the\n   documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE [-AUTHOR ``AS IS''-] {+COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"+}\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED. IN NO EVENT SHALL THE [-AUTHOR-] {+COPYRIGHT OWNER OR CONTRIBUTORS+} BE\nLIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\nSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n%\n\nThat's hardly any difference. Note that the file BSD-2 has an empty\nline just before the first bullet point. This will cause git to treat\nanything after that line as different for some reason. The resulting\ndiff is thus hardly useful:\n\n% git --no-pager diff --word-diff=plain --no-index less BSD-2\ndiff --git a/licences/less b/licences/BSD-2\nindex 7e4887b..a995d54 100644\n--- a/licences/less\n+++ b/licences/BSD-2\n@@ -1,27 +1,23 @@\n[-Less License-]\n[-                          -------------]\n\n[-Less-]Copyright [-(C) 1984-2005  Mark Nudelman-]{+(c) <YEAR>, <OWNER>+}\n{+All rights reserved.+}\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:[-1. Redistributions of source code must retain the above copyright-]\n[-   notice, this list of conditions and the following disclaimer.-]\n[-2. Redistributions in binary form must reproduce the above copyright-]\n[-   notice in the documentation and/or other materials provided with -]\n[-   the distribution.-]\n\n[-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY-]\n[-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE-]\n[-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -]\n[-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE-]\n[-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -]\n[-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -]\n[-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -]\n[-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -]\n[-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -]\n[-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -]\n[-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-]{+1. Redistributions of source code must retain the above copyright notice,+}\n{+   this list of conditions and the following disclaimer.+}\n{+2. Redistributions in binary form must reproduce the above copyright+}\n{+   notice, this list of conditions and the following disclaimer in the+}\n{+   documentation and/or other materials provided with the distribution.+}\n\n{+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"+}\n{+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+}\n{+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE+}\n{+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE+}\n{+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR+}\n{+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF+}\n{+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS+}\n{+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN+}\n{+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)+}\n{+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE+}\n{+POSSIBILITY OF SUCH DAMAGE.+}\n%\n\n\nBest regards,\n\nElias Pipping\n\n\nCopyright (c) <YEAR>, <OWNER>\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice,\n   this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE\nLIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\nSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\n\n                          Less License\n                          ------------\n\nLess\nCopyright (C) 1984-2005  Mark Nudelman\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice in the documentation and/or other materials provided with \n   the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR \nPURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT \nOF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR \nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE \nOR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN \nIF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n"}]}