From 2130bf3ca9a0ce6ea8bebaa5e3abbecb48b02c09 Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Mon, 22 Apr 2013 18:57:37 +0300 Subject: [PATCH 1/3] cherry-pick/revert: make usage say '...' The usage string for cherry-pick and revert has never been updated to reflect their ability to handle multiple commits. Other documentation is already correct. Signed-off-by: Kevin Bracey Signed-off-by: Junio C Hamano --- builtin/revert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index c5e36b94c0..0401fdb02c 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -19,13 +19,13 @@ */ static const char * const revert_usage[] = { - N_("git revert [options] "), + N_("git revert [options] ..."), N_("git revert "), NULL }; static const char * const cherry_pick_usage[] = { - N_("git cherry-pick [options] "), + N_("git cherry-pick [options] ..."), N_("git cherry-pick "), NULL }; From 7612e61e33981f48f212f6aefe3550ac724d6208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Wed, 24 Apr 2013 22:49:06 +0200 Subject: [PATCH 2/3] completion: remove duplicate block for "git commit -c" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove one of two consecutive, identical blocks for "git commit -c". This was caused by a mechanical mismerge at d931e2fb252e (Merge branch 'mp/complete-paths', 2013-02-08). The side branch wanted to add this block at fea16b47 but the same fix was done independently at 685397585 already. Signed-off-by: Mårten Kongstad Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 7 ------- 1 file changed, 7 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 93eba46750..f67b0f008b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1182,13 +1182,6 @@ _git_commit () ;; esac - case "$prev" in - -c|-C) - __gitcomp_nl "$(__git_refs)" "" "${cur}" - return - ;; - esac - case "$cur" in --cleanup=*) __gitcomp "default strip verbatim whitespace From 173f9a7145ab71d8ea916840836246afc6db66ef Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 24 Apr 2013 16:22:07 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.8.2.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.2.2.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/RelNotes/1.8.2.2.txt b/Documentation/RelNotes/1.8.2.2.txt index 3b919e89ef..4f4c4df99b 100644 --- a/Documentation/RelNotes/1.8.2.2.txt +++ b/Documentation/RelNotes/1.8.2.2.txt @@ -4,6 +4,24 @@ Git v1.8.2.2 Release Notes Fixes since v1.8.2.1 -------------------- + * "git diff --diff-algorithm=algo" was understood by the command line + parser, but "git diff --diff-algorithm algo" was not. + + * "git log -S/-G" started paying attention to textconv filter, but + there was no way to disable this. Make it honor --no-textconv + option. + + * "git merge $(git rev-parse v1.8.2)" behaved quite differently from + "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did + not pay much attention to the annotated tag payload. Make the code + notice the type of the tag object, in addition to the dwim_ref() + based classification the current code uses (i.e. the name appears + in refs/tags/) to decide when to special case merging of tags. + + * "git cherry-pick" and "git revert" can take more than one commit + on the command line these days, but it was not mentioned on the usage + text. + * Perl scripts like "git-svn" closed (not redirecting to /dev/null) the standard error stream, which is not a very smart thing to do. Later open may return file descriptor #2 for unrelated purpose, and