Merge branch 'master' of git://bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 02:11:31 +0000 (18:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 02:11:31 +0000 (18:11 -0800)
* '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

1  2 
contrib/completion/git-completion.bash
index ab24310569c68084ad739297f969d725838c9c58,64be572eedf0c0178f32562756d195cc36fb3cbf..3a05a5b74ca8239aeb5cd7446a72b9e8a7b6e6ab
@@@ -313,7 -313,7 +313,7 @@@ __git_ps1 (
                fi
  
                local f="$w$i$s$u"
 -              printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
 +              printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
        fi
  }
  
@@@ -2512,7 -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,--*)