diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:30:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:30:04 -0700 |
| commit | 2d0b07178d548fd23954e3a6444f1d4d2d8b3a40 (patch) | |
| tree | f3282ab31a25542da1bfc51f241f221084adca9f | |
| parent | 30d925541e73185f24e77cf5837b798dd45ca438 (diff) | |
| parent | 173f9a7145ab71d8ea916840836246afc6db66ef (diff) | |
| download | git-2d0b07178d548fd23954e3a6444f1d4d2d8b3a40.tar.gz git-2d0b07178d548fd23954e3a6444f1d4d2d8b3a40.tar.xz | |
Sync with maint
* maint:
Update draft release notes to 1.8.2.2
completion: remove duplicate block for "git commit -c"
cherry-pick/revert: make usage say '<commit-ish>...'
| -rw-r--r-- | Documentation/RelNotes/1.8.2.2.txt | 18 | ||||
| -rw-r--r-- | builtin/revert.c | 4 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 7 |
3 files changed, 20 insertions, 9 deletions
diff --git a/Documentation/RelNotes/1.8.2.2.txt b/Documentation/RelNotes/1.8.2.2.txt index 3b919e89e..4f4c4df99 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 diff --git a/builtin/revert.c b/builtin/revert.c index c5e36b94c..0401fdb02 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -19,13 +19,13 @@ */ static const char * const revert_usage[] = { - N_("git revert [options] <commit-ish>"), + N_("git revert [options] <commit-ish>..."), N_("git revert <subcommand>"), NULL }; static const char * const cherry_pick_usage[] = { - N_("git cherry-pick [options] <commit-ish>"), + N_("git cherry-pick [options] <commit-ish>..."), N_("git cherry-pick <subcommand>"), NULL }; diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6df62c217..bc3fc9e32 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1184,13 +1184,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 |