Merge branch 'maint'

* maint:
  Update draft release notes for 1.6.0.2
  stash: refresh the index before deciding if the work tree is dirty
  Mention the fact that 'git annotate' is only for backward compatibility.
  "blame -c" should be compatible with "annotate"
  git-gui: Fix diff parsing for lines starting with "--" or "++"
  git-gui: Fix string escaping in po2msg.sh
  git gui: show diffs with a minimum of 1 context line
  git-gui: update all remaining translations to French.
  git-gui: Update french translation

2 files changed, 25 insertions, 3 deletions

diff --git a/Documentation/RelNotes-1.6.0.2.txt b/Documentation/RelNotes-1.6.0.2.txt
index 686e60713b..6c5446bc07 100644
--- a/Documentation/RelNotes-1.6.0.2.txt
+++ b/Documentation/RelNotes-1.6.0.2.txt
@@ -18,19 +18,32 @@ Fixes since v1.6.0.1
   with GIT_WORK_TREE environment settings.
 
 
-
 * "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts
   a new line before the second line.
 
+* "git blame -c" did not exactly work like "git annotate" when range
+  boundaries are involved.
+
 * "git clone $there $here/" with extra trailing slashes after explicit
   local directory name $here did not work as expected.
 
 * "git diff --dirstat -M" did not add changes in subdirectories up
   correctly for renamed paths.
 
+* "git diff --cumulative" did not imply "--dirstat".
+
 * "git for-each-ref refs/heads/" did not work as expected.
 
-* "git log --grep=pattern -i" did not ignore case.
+* "git gui" allowed users to feed patch without any context to be applied.
+
+* "git gui" botched parsing "diff" output when a line that begins with two
+  dashes and a space gets removed or a line that begins with two pluses
+  and a space gets added.
+
+* "git gui" translation updates and i18n fixes.
+
+* "git log -i --grep=pattern" did not ignore case; neither "git log -E
+  --grep=pattern" triggered extended regexp.
 
 * "git log --pretty="%ad" --date=short" did not use short format when
   showing the timestamp.
@@ -38,6 +51,9 @@ Fixes since v1.6.0.1
 * Build procedure for "git shell" that used stub versions of some
   functions and globals was not understood by linkers on some platforms.
 
+* "git stash" was fooled by a stat-dirty but otherwise unmodified paths
+  and refused to work until the user refreshed the index.
+
 * "git verify-pack -v" did not work correctly when given more than one
   packfile.
 
@@ -45,6 +61,7 @@ Also contains many documentation updates.
 
 --
 exec >/var/tmp/1
-O=v1.6.0.1-49-g6a42cfe
+O=v1.6.0.1-61-g1eff26c
 echo O=$(git describe maint)
 git shortlog --no-merges $O..maint
+
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 8b6b56a544..0aba022ba6 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -14,6 +14,11 @@ DESCRIPTION
 Annotates each line in the given file with information from the commit
 which introduced the line. Optionally annotate from a given revision.
 
+The only difference between this command and linkgit:git-blame[1] is that
+they use slightly different output formats, and this command exists only
+for backward compatibility to support existing scripts, and provide more
+familiar command name for people coming from other SCM systems.
+
 OPTIONS
 -------
 include::blame-options.txt[]