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

diff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt
index 4a4530b7284105a86083edfdc2ae0895e06ac338..db1002e8c70693e34aaa0e7976218af81a335d3b 100644 (file)
--- 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 400cbb3b1c120b93278472678ee7bdb87a74f95b..aafd3a394126e4718b593eb5727412e16d2334e4 100644 (file)
--- 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 0ce916a1887b0846bfc5a6e2233242601e0dde79..966276b169d6fb09c571a05257dfbc1fe3bd4f03 100644 (file)
--- 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::
 

diff --git a/diffcore.h b/diffcore.h
index 713cca785c4b986b5f667086ad43c324f248929c..5b634585e8970de81067b9807d8813c083b86b0a 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -62,7 +62,7 @@ struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
        unsigned short int score;
-       char status; /* M C R N D U (see Documentation/diff-format.txt) */
+       char status; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */
        unsigned broken_pair : 1;
        unsigned renamed_pair : 1;
        unsigned is_unmerged : 1;