diff options
| author | Slava Kardakov <ojab@ojab.ru> | 2013-06-05 20:31:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-12 22:38:48 +0200 |
| commit | 9926f66fbd4392c9c7c05fae83e80bc12e0be889 (patch) | |
| tree | 193e7b45d2dde3c5d23607b33c6e0a2531cec059 /string-list.h | |
| parent | Merge branch 'maint' (diff) | |
| download | git-9926f66fbd4392c9c7c05fae83e80bc12e0be889.tar.xz git-9926f66fbd4392c9c7c05fae83e80bc12e0be889.zip | |
Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist
When a file (or a directory) called HEAD exists in the working tree,
internal calls git svn makes trigger "did you mean a revision or a
path?" ambiguity check.
$ git svn rebase
fatal: ambiguous argument 'HEAD': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
rev-list --first-parent --pretty=medium HEAD: command returned error: 128
Explicitly disambiguate by adding "--" after the revision.
Signed-off-by: Slava Kardakov <ojab@ojab.ru>
Reviewed-by: Jeff King <peff@peff.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'string-list.h')
0 files changed, 0 insertions, 0 deletions