diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 18:11:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 18:11:31 -0800 |
| commit | 675fff45a71b89b8ee2a595d945614764fbee347 (patch) | |
| tree | 0e125ece30b14e4f68f391dd3e753276974ba2c7 /contrib | |
| parent | bd444cadb53ce9030fe79f2cdb1570e1a49d4877 (diff) | |
| parent | 379862ec5a413e636d977a6ea3d618f0b3eafceb (diff) | |
| download | git-675fff45a71b89b8ee2a595d945614764fbee347.tar.gz | |
Merge branch 'master' of git://bogomips.org/git-svn
* 'master' of git://bogomips.org/git-svn:
git-svn.perl: fix a false-positive in the "already exists" test
git-svn.perl: perform deletions before anything else
git-svn: Fix time zone in --localtime
git-svn: un-break "git svn rebase" when log.abbrevCommit=true
git-svn: remove redundant porcelain option to rev-list
completion: add --interactive option to git svn dcommit
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ab24310569..3a05a5b74c 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2512,7 +2512,7 @@ _git_svn () __gitcomp " --merge --strategy= --verbose --dry-run --fetch-all --no-rebase --commit-url - --revision $cmt_opts $fc_opts + --revision --interactive $cmt_opts $fc_opts " ;; set-tree,--*) |