From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jan 2010 18:42:47 +0000 (-0800)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.7.0-rc0~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2bd6dbbe0b0f64ae801be2769a1818fc3ce43fa4;p=git.git

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: allow subset of branches/tags to be specified in glob spec
  git-svn: allow UUID to be manually remapped via rewriteUUID
  git-svn: update svn mergeinfo test suite
  git-svn: document --username/commit-url for branch/tag
  git-svn: add --username/commit-url options for branch/tag
  git-svn: respect commiturl option for branch/tag
  git-svn: fix mismatched src/dst errors for branch/tag
  git-svn: handle merge-base failures
  git-svn: ignore changeless commits when checking for a cherry-pick
---

2bd6dbbe0b0f64ae801be2769a1818fc3ce43fa4