diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-04 00:35:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-04 00:35:19 +0200 |
| commit | c4da6c0b76691c63e3f4aea3f1079b37ac0e6d98 (patch) | |
| tree | 7b7173e18d6823c743fd58df05144387261347b2 /git-merge-octopus.sh | |
| parent | Merge branch 'cb/http-multi-curl-auth' into maint (diff) | |
| parent | cherry-pick: do not expect file arguments (diff) | |
| download | git-c4da6c0b76691c63e3f4aea3f1079b37ac0e6d98.tar.xz git-c4da6c0b76691c63e3f4aea3f1079b37ac0e6d98.zip | |
Merge branch 'cb/cherry-pick-rev-path-confusion' into maint
The command line parser choked "git cherry-pick $name" when $name can be
both revision name and a pathname, even though $name can never be a path
in the context of the command.
By Clemens Buchacher
* cb/cherry-pick-rev-path-confusion:
cherry-pick: do not expect file arguments
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions