diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-18 22:29:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 22:29:37 -0800 |
| commit | 9003dd40272e556288129272655e654bd33e6fa5 (patch) | |
| tree | a986bf96809ec102fab98f0132c5981e9e061ee8 /contrib | |
| parent | mergetool: put the cursor on the editable file for Vim (diff) | |
| parent | git-svn: Show UUID in svn info for added directories with svn 1.5.5 (diff) | |
| download | tgif-9003dd40272e556288129272655e654bd33e6fa5.tar.xz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git-svn: Show UUID in svn info for added directories with svn 1.5.5
git-svn: avoid importing nested git repos
git-svn: fix SVN 1.1.x compatibility
git-svn: Add --localtime option to "fetch"
git-svn: better attempt to handle broken symlink updates
git-svn: handle empty files marked as symlinks in SVN
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 ec701e8069..60497a4c2a 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1576,7 +1576,7 @@ _git_svn () --follow-parent --authors-file= --repack= --no-metadata --use-svm-props --use-svnsync-props --log-window-size= --no-checkout --quiet - --repack-flags --user-log-author $remote_opts + --repack-flags --user-log-author --localtime $remote_opts " local init_opts=" --template= --shared= --trunk= --tags= |