diff: add --word-diff option that generalizes --color-words

diff --git a/Documentation/RelNotes-1.7.0.3.txt b/Documentation/RelNotes-1.7.0.3.txt
index ed936385a5fb93b213f4dc7e61c6a4a3d758f2bf..3b355737c0c0d7a55b843a324e55aed8ff736a94 100644 (file)
--- a/Documentation/RelNotes-1.7.0.3.txt
+++ b/Documentation/RelNotes-1.7.0.3.txt
@@ -1,5 +1,5 @@
-Git v1.7.0.3 Release Notes (draft)
-==================================
+Git v1.7.0.3 Release Notes
+==========================
 
 Fixes since v1.7.0.2
 --------------------
@@ -9,6 +9,9 @@ Fixes since v1.7.0.2
 
  * "git add -i" didn't handle a deleted path very well.
 
+ * "git blame" padded line numbers with one extra SP when the total number
+   of lines was one less than multiple of ten due to an off-by-one error.
+
  * "git fetch --all/--multi" used to discard information for remotes that
    are fetched earlier.
 
@@ -16,6 +19,9 @@ Fixes since v1.7.0.2
    or are written by "me", instead of the ones that have "it" _and_ are
    written by "me".
 
+ * "git log -g branch" misbehaved when there was no entries in the reflog
+   for the named branch.
+
  * "git mailinfo" (hence "git am") incorrectly removed initial indent from
    paragraphs.
 
@@ -26,9 +32,3 @@ Fixes since v1.7.0.2
    matching branch.<name>.remote.
 
 And other minor fixes and documentation updates.
-
---
-exec >/var/tmp/1
-echo O=$(git describe)
-O=v1.7.0.2-53-g6eb3adf
-git shortlog --no-merges $O..