Merge branch 'maint'

* maint:
  Update draft release notes to 1.6.0.5
  generate-cmdlist.sh: avoid selecting synopsis at wrong place

2 files changed, 23 insertions, 1 deletions

diff --git a/Documentation/RelNotes-1.6.0.5.txt b/Documentation/RelNotes-1.6.0.5.txt
index 62f95e6ba..1dc101c6a 100644
--- a/Documentation/RelNotes-1.6.0.5.txt
+++ b/Documentation/RelNotes-1.6.0.5.txt
@@ -10,12 +10,34 @@ Fixes since v1.6.0.4
 * 'git checkout' from an un-checked-out state did not allow switching out
   of the current branch.
 
+* 'git diff' always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for
+  the command.
+
+* 'git fast-export' did not export all tags.
+
+* 'git ls-files --with-tree=<tree>' did not work with options other
+  than -c, most notably with -m.
+
 * 'git pack-objects' did not make its best effort to honor --max-pack-size
   option when a single first object already busted the given limit and
   placed many objects in a single pack.
 
+* 'git-p4' fast import frontend was too eager to trigger its keyword expansion
+  logic, even on a keyword-looking string that does not have closing '$' on the
+  same line.
+
+* 'git push $there' when the remote $there is defined in $GIT_DIR/branches/$there
+  behaves more like what cg-push from Cogito used to work.
+
+* 'git tag' did not complain when given mutually incompatible set of options.
+
 * 'make check' cannot be run without sparse; people may have meant to say
   'make test' instead, so suggest that.
 
 * Many unsafe call to sprintf() style varargs functions are corrected.
 
+* Also contains quite a few documentation updates.
+
+--
+O=v1.6.0.4-39-g27f6496
+
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index a2913c2a2..75c68d948 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -14,7 +14,7 @@ sort |
 while read cmd
 do
      sed -n '
-     /NAME/,/git-'"$cmd"'/H
+     /^NAME/,/git-'"$cmd"'/H
      ${
             x
             s/.*git-'"$cmd"' - \(.*\)/  {"'"$cmd"'", "\1"},/