Merge branch 'maint'

* maint:
  Add reference for status letters in documentation.
  Document that git-log takes --all-match.
  Update draft 1.6.0.4 release notes

3 files changed, 38 insertions, 7 deletions

diff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt
index 4a4530b728..db1002e8c7 100644
--- a/Documentation/RelNotes-1.6.0.4.txt
+++ b/Documentation/RelNotes-1.6.0.4.txt
@@ -4,19 +4,30 @@ GIT v1.6.0.4 Release Notes
 Fixes since v1.6.0.3
 --------------------
 
-* 'git-add -p' said "No changes" when only binary files were changed.
+* 'git add -p' said "No changes" when only binary files were changed.
 
-* git-archive did not work correctly in bare repositories.
+* 'git archive' did not work correctly in bare repositories.
+
+* 'git checkout -t -b newbranch' when you are on detached HEAD was broken.
 
 * when we refuse to detect renames because there are too many new or
-  deleted files, we did not say how many there are.
+  deleted files, 'git diff' did not say how many there are.
 
-* 'git-push --mirror' tried and failed to push the stash; there is no
+* 'git push --mirror' tried and failed to push the stash; there is no
   point in sending it to begin with.
 
-* 'git-send-email' had a small fd leak while scanning directory.
+* 'git pull $there $branch:$current_branch' did not work when you were on
+  a branch yet to be born.
+
+* when giving up resolving a conflicted merge, 'git reset --hard' failed
+  to remove new paths from the working tree.
+
+* 'git send-email' had a small fd leak while scanning directory.
+
+* 'git status' incorrectly reported a submodule directory as an untracked
+  directory.
 
-* git-svn used deprecated 'git-foo' form of subcommand invocaition.
+* 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
 
 * Plugged small memleaks here and there.
 
@@ -24,6 +35,6 @@ Fixes since v1.6.0.3
 
 --
 exec >/var/tmp/1
-O=v1.6.0.3-22-gc2163c6
+O=v1.6.0.3-34-gf6276b7
 echo O=$(git describe maint)
 git shortlog --no-merges $O..maint
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 400cbb3b1c..aafd3a3941 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -46,6 +46,22 @@ That is, from the left to the right:
 . path for "dst"; only exists for C or R.
 . an LF or a NUL when '-z' option is used, to terminate the record.
 
+Possible status letters are:
+
+- A: addition of a file
+- C: copy of a file into a new one
+- D: deletion of a file
+- M: modification of the contents or mode of a file
+- R: renaming of a file
+- T: change in the type of the file
+- U: file is unmerged (you must complete the merge before it can
+be committed)
+- X: "unknown" change type (most probably a bug, please report it)
+
+Status letters C and M are always followed by a score (denoting the
+percentage of similarity between the source and target of the move or
+copy), and are the only ones to be so.
+
 <sha1> is shown as all 0's if a file is new on the filesystem
 and it is out of sync with the index.
 
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 0ce916a188..966276b169 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -174,6 +174,10 @@ endif::git-rev-list[]
 	Limit the commits output to ones with log message that
 	matches the specified pattern (regular expression).
 
+--all-match::
+	Limit the commits output to ones that match all given --grep,
+	--author and --committer instead of ones that match at least one.
+
 -i::
 --regexp-ignore-case::