summaryrefslogtreecommitdiff
path: root/builtin-annotate.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-18 22:29:37 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-18 22:29:37 -0800
commit9003dd40272e556288129272655e654bd33e6fa5 (patch)
treea986bf96809ec102fab98f0132c5981e9e061ee8 /builtin-annotate.c
parent71ee483abd44b1a69cd2ac005c75d3c885830a5c (diff)
parent22ba47f544a233958c73a9260b18c57b431f44b3 (diff)
downloadgit-9003dd40272e556288129272655e654bd33e6fa5.tar.gz
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 'builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions