From 02893a8503158823e42ca1d4d59faae691684b54 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 2 Nov 2008 14:35:41 -0800 Subject: [PATCH 1/3] Update draft 1.6.0.4 release notes Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.0.4.txt | 25 ++++++++++++++++++------- 1 file changed, 18 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. -* git-svn used deprecated 'git-foo' form of subcommand invocaition. +* 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. * 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 From 7756ba74c04caf03d47718d581439a48bae7ed73 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 2 Nov 2008 19:32:46 +0100 Subject: [PATCH 2/3] Document that git-log takes --all-match. Signed-off-by: Mikael Magnusson Signed-off-by: Junio C Hamano --- Documentation/rev-list-options.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 735cf07b20..5df35ce519 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:: From a5a323f33cd25829e0dde3939b196cf743d7d9d8 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sun, 2 Nov 2008 14:37:28 +0100 Subject: [PATCH 3/3] Add reference for status letters in documentation. Also fix error in diff_filepair::status documentation, and point to the in-code reference as well as the doc. Signed-off-by: Yann Dirson Signed-off-by: Junio C Hamano --- Documentation/diff-format.txt | 16 ++++++++++++++++ diffcore.h | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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. + 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/diffcore.h b/diffcore.h index 8ae35785fd..1ebfdae8b8 100644 --- a/diffcore.h +++ b/diffcore.h @@ -58,7 +58,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;