aboutsummaryrefslogtreecommitdiffstats
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-06 10:41:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-06 10:41:17 -0700
commit0c41f33c19c2f40015e31211557e818b000f9a25 (patch)
tree082c327638afe97d14a8417603034537392f4d8d /git-svn.perl
parentMerge branch 'mg/rev-list-n-reverse-doc' into maint (diff)
parentsubmodule: process conflicting submodules only once (diff)
downloadgit-0c41f33c19c2f40015e31211557e818b000f9a25.tar.gz
git-0c41f33c19c2f40015e31211557e818b000f9a25.zip
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
* nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions