Documentation / git-svn.txton commit Merge branch 'tr/http-updates' (637afcf)
   1git-svn(1)
   2==========
   3
   4NAME
   5----
   6git-svn - Bidirectional operation between a Subversion repository and git
   7
   8SYNOPSIS
   9--------
  10'git svn' <command> [options] [arguments]
  11
  12DESCRIPTION
  13-----------
  14'git svn' is a simple conduit for changesets between Subversion and git.
  15It provides a bidirectional flow of changes between a Subversion and a git
  16repository.
  17
  18'git svn' can track a standard Subversion repository,
  19following the common "trunk/branches/tags" layout, with the --stdlayout option.
  20It can also follow branches and tags in any layout with the -T/-t/-b options
  21(see options to 'init' below, and also the 'clone' command).
  22
  23Once tracking a Subversion repository (with any of the above methods), the git
  24repository can be updated from Subversion by the 'fetch' command and
  25Subversion updated from git by the 'dcommit' command.
  26
  27COMMANDS
  28--------
  29
  30'init'::
  31        Initializes an empty git repository with additional
  32        metadata directories for 'git svn'.  The Subversion URL
  33        may be specified as a command-line argument, or as full
  34        URL arguments to -T/-t/-b.  Optionally, the target
  35        directory to operate on can be specified as a second
  36        argument.  Normally this command initializes the current
  37        directory.
  38
  39-T<trunk_subdir>;;
  40--trunk=<trunk_subdir>;;
  41-t<tags_subdir>;;
  42--tags=<tags_subdir>;;
  43-b<branches_subdir>;;
  44--branches=<branches_subdir>;;
  45-s;;
  46--stdlayout;;
  47        These are optional command-line options for init.  Each of
  48        these flags can point to a relative repository path
  49        (--tags=project/tags) or a full url
  50        (--tags=https://foo.org/project/tags).
  51        You can specify more than one --tags and/or --branches options, in case
  52        your Subversion repository places tags or branches under multiple paths.
  53        The option --stdlayout is
  54        a shorthand way of setting trunk,tags,branches as the relative paths,
  55        which is the Subversion default. If any of the other options are given
  56        as well, they take precedence.
  57--no-metadata;;
  58        Set the 'noMetadata' option in the [svn-remote] config.
  59--use-svm-props;;
  60        Set the 'useSvmProps' option in the [svn-remote] config.
  61--use-svnsync-props;;
  62        Set the 'useSvnsyncProps' option in the [svn-remote] config.
  63--rewrite-root=<URL>;;
  64        Set the 'rewriteRoot' option in the [svn-remote] config.
  65--username=<USER>;;
  66        For transports that SVN handles authentication for (http,
  67        https, and plain svn), specify the username.  For other
  68        transports (eg svn+ssh://), you must include the username in
  69        the URL, eg svn+ssh://foo@svn.bar.com/project
  70--prefix=<prefix>;;
  71        This allows one to specify a prefix which is prepended
  72        to the names of remotes if trunk/branches/tags are
  73        specified.  The prefix does not automatically include a
  74        trailing slash, so be sure you include one in the
  75        argument if that is what you want.  If --branches/-b is
  76        specified, the prefix must include a trailing slash.
  77        Setting a prefix is useful if you wish to track multiple
  78        projects that share a common repository.
  79--ignore-paths=<regex>;;
  80        When passed to 'init' or 'clone' this regular expression will
  81        be preserved as a config key.  See 'fetch' for a description
  82        of '--ignore-paths'.
  83--no-minimize-url;;
  84        When tracking multiple directories (using --stdlayout,
  85        --branches, or --tags options), git svn will attempt to connect
  86        to the root (or highest allowed level) of the Subversion
  87        repository.  This default allows better tracking of history if
  88        entire projects are moved within a repository, but may cause
  89        issues on repositories where read access restrictions are in
  90        place.  Passing '--no-minimize-url' will allow git svn to
  91        accept URLs as-is without attempting to connect to a higher
  92        level directory.  This option is off by default when only
  93        one URL/branch is tracked (it would do little good).
  94
  95'fetch'::
  96        Fetch unfetched revisions from the Subversion remote we are
  97        tracking.  The name of the [svn-remote "..."] section in the
  98        .git/config file may be specified as an optional command-line
  99        argument.
 100
 101--localtime;;
 102        Store Git commit times in the local timezone instead of UTC.  This
 103        makes 'git log' (even without --date=local) show the same times
 104        that `svn log` would in the local timezone.
 105+
 106This doesn't interfere with interoperating with the Subversion
 107repository you cloned from, but if you wish for your local Git
 108repository to be able to interoperate with someone else's local Git
 109repository, either don't use this option or you should both use it in
 110the same local timezone.
 111
 112--parent;;
 113        Fetch only from the SVN parent of the current HEAD.
 114
 115--ignore-paths=<regex>;;
 116        This allows one to specify a Perl regular expression that will
 117        cause skipping of all matching paths from checkout from SVN.
 118        The '--ignore-paths' option should match for every 'fetch'
 119        (including automatic fetches due to 'clone', 'dcommit',
 120        'rebase', etc) on a given repository.
 121+
 122[verse]
 123config key: svn-remote.<name>.ignore-paths
 124+
 125If the ignore-paths config key is set and the command line option is
 126also given, both regular expressions will be used.
 127+
 128Examples:
 129+
 130--
 131Skip "doc*" directory for every fetch;;
 132+
 133------------------------------------------------------------------------
 134--ignore-paths="^doc"
 135------------------------------------------------------------------------
 136
 137Skip "branches" and "tags" of first level directories;;
 138+
 139------------------------------------------------------------------------
 140--ignore-paths="^[^/]+/(?:branches|tags)"
 141------------------------------------------------------------------------
 142--
 143
 144--use-log-author;;
 145        When retrieving svn commits into git (as part of fetch, rebase, or
 146        dcommit operations), look for the first From: or Signed-off-by: line
 147        in the log message and use that as the author string.
 148--add-author-from;;
 149        When committing to svn from git (as part of commit or dcommit
 150        operations), if the existing log message doesn't already have a
 151        From: or Signed-off-by: line, append a From: line based on the
 152        git commit's author string.  If you use this, then --use-log-author
 153        will retrieve a valid author string for all commits.
 154
 155'clone'::
 156        Runs 'init' and 'fetch'.  It will automatically create a
 157        directory based on the basename of the URL passed to it;
 158        or if a second argument is passed; it will create a directory
 159        and work within that.  It accepts all arguments that the
 160        'init' and 'fetch' commands accept; with the exception of
 161        '--fetch-all' and '--parent'.  After a repository is cloned,
 162        the 'fetch' command will be able to update revisions without
 163        affecting the working tree; and the 'rebase' command will be
 164        able to update the working tree with the latest changes.
 165
 166'rebase'::
 167        This fetches revisions from the SVN parent of the current HEAD
 168        and rebases the current (uncommitted to SVN) work against it.
 169+
 170This works similarly to `svn update` or 'git pull' except that
 171it preserves linear history with 'git rebase' instead of
 172'git merge' for ease of dcommitting with 'git svn'.
 173+
 174This accepts all options that 'git svn fetch' and 'git rebase'
 175accept.  However, '--fetch-all' only fetches from the current
 176[svn-remote], and not all [svn-remote] definitions.
 177+
 178Like 'git rebase'; this requires that the working tree be clean
 179and have no uncommitted changes.
 180
 181-l;;
 182--local;;
 183        Do not fetch remotely; only run 'git rebase' against the
 184        last fetched commit from the upstream SVN.
 185
 186'dcommit'::
 187        Commit each diff from a specified head directly to the SVN
 188        repository, and then rebase or reset (depending on whether or
 189        not there is a diff between SVN and head).  This will create
 190        a revision in SVN for each commit in git.
 191        It is recommended that you run 'git svn' fetch and rebase (not
 192        pull or merge) your commits against the latest changes in the
 193        SVN repository.
 194        An optional revision or branch argument may be specified, and
 195        causes 'git svn' to do all work on that revision/branch
 196        instead of HEAD.
 197        This is advantageous over 'set-tree' (below) because it produces
 198        cleaner, more linear history.
 199+
 200--no-rebase;;
 201        After committing, do not rebase or reset.
 202--commit-url <URL>;;
 203        Commit to this SVN URL (the full path).  This is intended to
 204        allow existing 'git svn' repositories created with one transport
 205        method (e.g. `svn://` or `http://` for anonymous read) to be
 206        reused if a user is later given access to an alternate transport
 207        method (e.g. `svn+ssh://` or `https://`) for commit.
 208+
 209[verse]
 210config key: svn-remote.<name>.commiturl
 211config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
 212+
 213Using this option for any other purpose (don't ask) is very strongly
 214discouraged.
 215
 216'branch'::
 217        Create a branch in the SVN repository.
 218
 219-m;;
 220--message;;
 221        Allows to specify the commit message.
 222
 223-t;;
 224--tag;;
 225        Create a tag by using the tags_subdir instead of the branches_subdir
 226        specified during git svn init.
 227
 228-d;;
 229--destination;;
 230        If more than one --branches (or --tags) option was given to the 'init'
 231        or 'clone' command, you must provide the location of the branch (or
 232        tag) you wish to create in the SVN repository.  The value of this
 233        option must match one of the paths specified by a --branches (or
 234        --tags) option.  You can see these paths with the commands
 235+
 236        git config --get-all svn-remote.<name>.branches
 237        git config --get-all svn-remote.<name>.tags
 238+
 239where <name> is the name of the SVN repository as specified by the -R option to
 240'init' (or "svn" by default).
 241
 242'tag'::
 243        Create a tag in the SVN repository. This is a shorthand for
 244        'branch -t'.
 245
 246'log'::
 247        This should make it easy to look up svn log messages when svn
 248        users refer to -r/--revision numbers.
 249+
 250The following features from `svn log' are supported:
 251+
 252--
 253-r <n>[:<n>];;
 254--revision=<n>[:<n>];;
 255        is supported, non-numeric args are not:
 256        HEAD, NEXT, BASE, PREV, etc ...
 257-v;;
 258--verbose;;
 259        it's not completely compatible with the --verbose
 260        output in svn log, but reasonably close.
 261--limit=<n>;;
 262        is NOT the same as --max-count, doesn't count
 263        merged/excluded commits
 264--incremental;;
 265        supported
 266--
 267+
 268New features:
 269+
 270--
 271--show-commit;;
 272        shows the git commit sha1, as well
 273--oneline;;
 274        our version of --pretty=oneline
 275--
 276+
 277NOTE: SVN itself only stores times in UTC and nothing else. The regular svn
 278client converts the UTC time to the local time (or based on the TZ=
 279environment). This command has the same behaviour.
 280+
 281Any other arguments are passed directly to 'git log'
 282
 283'blame'::
 284       Show what revision and author last modified each line of a file. The
 285       output of this mode is format-compatible with the output of
 286       `svn blame' by default. Like the SVN blame command,
 287       local uncommitted changes in the working copy are ignored;
 288       the version of the file in the HEAD revision is annotated. Unknown
 289       arguments are passed directly to 'git blame'.
 290+
 291--git-format;;
 292        Produce output in the same format as 'git blame', but with
 293        SVN revision numbers instead of git commit hashes. In this mode,
 294        changes that haven't been committed to SVN (including local
 295        working-copy edits) are shown as revision 0.
 296
 297'find-rev'::
 298        When given an SVN revision number of the form 'rN', returns the
 299        corresponding git commit hash (this can optionally be followed by a
 300        tree-ish to specify which branch should be searched).  When given a
 301        tree-ish, returns the corresponding SVN revision number.
 302
 303'set-tree'::
 304        You should consider using 'dcommit' instead of this command.
 305        Commit specified commit or tree objects to SVN.  This relies on
 306        your imported fetch data being up-to-date.  This makes
 307        absolutely no attempts to do patching when committing to SVN, it
 308        simply overwrites files with those specified in the tree or
 309        commit.  All merging is assumed to have taken place
 310        independently of 'git svn' functions.
 311
 312'create-ignore'::
 313        Recursively finds the svn:ignore property on directories and
 314        creates matching .gitignore files. The resulting files are staged to
 315        be committed, but are not committed. Use -r/--revision to refer to a
 316        specific revision.
 317
 318'show-ignore'::
 319        Recursively finds and lists the svn:ignore property on
 320        directories.  The output is suitable for appending to
 321        the $GIT_DIR/info/exclude file.
 322
 323'mkdirs'::
 324        Attempts to recreate empty directories that core git cannot track
 325        based on information in $GIT_DIR/svn/<refname>/unhandled.log files.
 326        Empty directories are automatically recreated when using
 327        "git svn clone" and "git svn rebase", so "mkdirs" is intended
 328        for use after commands like "git checkout" or "git reset".
 329
 330'commit-diff'::
 331        Commits the diff of two tree-ish arguments from the
 332        command-line.  This command does not rely on being inside an `git svn
 333        init`-ed repository.  This command takes three arguments, (a) the
 334        original tree to diff against, (b) the new tree result, (c) the
 335        URL of the target Subversion repository.  The final argument
 336        (URL) may be omitted if you are working from a 'git svn'-aware
 337        repository (that has been `init`-ed with 'git svn').
 338        The -r<revision> option is required for this.
 339
 340'info'::
 341        Shows information about a file or directory similar to what
 342        `svn info' provides.  Does not currently support a -r/--revision
 343        argument.  Use the --url option to output only the value of the
 344        'URL:' field.
 345
 346'proplist'::
 347        Lists the properties stored in the Subversion repository about a
 348        given file or directory.  Use -r/--revision to refer to a specific
 349        Subversion revision.
 350
 351'propget'::
 352        Gets the Subversion property given as the first argument, for a
 353        file.  A specific revision can be specified with -r/--revision.
 354
 355'show-externals'::
 356        Shows the Subversion externals.  Use -r/--revision to specify a
 357        specific revision.
 358
 359'gc'::
 360        Compress $GIT_DIR/svn/<refname>/unhandled.log files in .git/svn
 361        and remove $GIT_DIR/svn/<refname>index files in .git/svn.
 362
 363'reset'::
 364        Undoes the effects of 'fetch' back to the specified revision.
 365        This allows you to re-'fetch' an SVN revision.  Normally the
 366        contents of an SVN revision should never change and 'reset'
 367        should not be necessary.  However, if SVN permissions change,
 368        or if you alter your --ignore-paths option, a 'fetch' may fail
 369        with "not found in commit" (file not previously visible) or
 370        "checksum mismatch" (missed a modification).  If the problem
 371        file cannot be ignored forever (with --ignore-paths) the only
 372        way to repair the repo is to use 'reset'.
 373+
 374Only the rev_map and refs/remotes/git-svn are changed.  Follow 'reset'
 375with a 'fetch' and then 'git reset' or 'git rebase' to move local
 376branches onto the new tree.
 377
 378-r <n>;;
 379--revision=<n>;;
 380        Specify the most recent revision to keep.  All later revisions
 381        are discarded.
 382-p;;
 383--parent;;
 384        Discard the specified revision as well, keeping the nearest
 385        parent instead.
 386Example:;;
 387Assume you have local changes in "master", but you need to refetch "r2".
 388+
 389------------
 390    r1---r2---r3 remotes/git-svn
 391                \
 392                 A---B master
 393------------
 394+
 395Fix the ignore-paths or SVN permissions problem that caused "r2" to
 396be incomplete in the first place.  Then:
 397+
 398[verse]
 399git svn reset -r2 -p
 400git svn fetch
 401+
 402------------
 403    r1---r2'--r3' remotes/git-svn
 404      \
 405       r2---r3---A---B master
 406------------
 407+
 408Then fixup "master" with 'git rebase'.
 409Do NOT use 'git merge' or your history will not be compatible with a
 410future 'dcommit'!
 411+
 412[verse]
 413git rebase --onto remotes/git-svn A^ master
 414+
 415------------
 416    r1---r2'--r3' remotes/git-svn
 417                \
 418                 A'--B' master
 419------------
 420
 421OPTIONS
 422-------
 423
 424--shared[={false|true|umask|group|all|world|everybody}]::
 425--template=<template_directory>::
 426        Only used with the 'init' command.
 427        These are passed directly to 'git init'.
 428
 429-r <ARG>::
 430--revision <ARG>::
 431           Used with the 'fetch' command.
 432+
 433This allows revision ranges for partial/cauterized history
 434to be supported.  $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
 435$NUMBER:HEAD, and BASE:$NUMBER are all supported.
 436+
 437This can allow you to make partial mirrors when running fetch;
 438but is generally not recommended because history will be skipped
 439and lost.
 440
 441-::
 442--stdin::
 443        Only used with the 'set-tree' command.
 444+
 445Read a list of commits from stdin and commit them in reverse
 446order.  Only the leading sha1 is read from each line, so
 447'git rev-list --pretty=oneline' output can be used.
 448
 449--rmdir::
 450        Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
 451+
 452Remove directories from the SVN tree if there are no files left
 453behind.  SVN can version empty directories, and they are not
 454removed by default if there are no files left in them.  git
 455cannot version empty directories.  Enabling this flag will make
 456the commit to SVN act like git.
 457+
 458[verse]
 459config key: svn.rmdir
 460
 461-e::
 462--edit::
 463        Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
 464+
 465Edit the commit message before committing to SVN.  This is off by
 466default for objects that are commits, and forced on when committing
 467tree objects.
 468+
 469[verse]
 470config key: svn.edit
 471
 472-l<num>::
 473--find-copies-harder::
 474        Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
 475+
 476They are both passed directly to 'git diff-tree'; see
 477linkgit:git-diff-tree[1] for more information.
 478+
 479[verse]
 480config key: svn.l
 481config key: svn.findcopiesharder
 482
 483-A<filename>::
 484--authors-file=<filename>::
 485        Syntax is compatible with the file used by 'git cvsimport':
 486+
 487------------------------------------------------------------------------
 488        loginname = Joe User <user@example.com>
 489------------------------------------------------------------------------
 490+
 491If this option is specified and 'git svn' encounters an SVN
 492committer name that does not exist in the authors-file, 'git svn'
 493will abort operation. The user will then have to add the
 494appropriate entry.  Re-running the previous 'git svn' command
 495after the authors-file is modified should continue operation.
 496+
 497[verse]
 498config key: svn.authorsfile
 499
 500--authors-prog=<filename>::
 501        If this option is specified, for each SVN committer name that
 502        does not exist in the authors file, the given file is executed
 503        with the committer name as the first argument.  The program is
 504        expected to return a single line of the form "Name <email>",
 505        which will be treated as if included in the authors file.
 506
 507-q::
 508--quiet::
 509        Make 'git svn' less verbose. Specify a second time to make it
 510        even less verbose.
 511
 512--repack[=<n>]::
 513--repack-flags=<flags>::
 514        These should help keep disk usage sane for large fetches with
 515        many revisions.
 516+
 517--repack takes an optional argument for the number of revisions
 518to fetch before repacking.  This defaults to repacking every
 5191000 commits fetched if no argument is specified.
 520+
 521--repack-flags are passed directly to 'git repack'.
 522+
 523[verse]
 524config key: svn.repack
 525config key: svn.repackflags
 526
 527-m::
 528--merge::
 529-s<strategy>::
 530--strategy=<strategy>::
 531        These are only used with the 'dcommit' and 'rebase' commands.
 532+
 533Passed directly to 'git rebase' when using 'dcommit' if a
 534'git reset' cannot be used (see 'dcommit').
 535
 536-n::
 537--dry-run::
 538        This can be used with the 'dcommit', 'rebase', 'branch' and
 539        'tag' commands.
 540+
 541For 'dcommit', print out the series of git arguments that would show
 542which diffs would be committed to SVN.
 543+
 544For 'rebase', display the local branch associated with the upstream svn
 545repository associated with the current branch and the URL of svn
 546repository that will be fetched from.
 547+
 548For 'branch' and 'tag', display the urls that will be used for copying when
 549creating the branch or tag.
 550
 551
 552ADVANCED OPTIONS
 553----------------
 554
 555-i<GIT_SVN_ID>::
 556--id <GIT_SVN_ID>::
 557        This sets GIT_SVN_ID (instead of using the environment).  This
 558        allows the user to override the default refname to fetch from
 559        when tracking a single URL.  The 'log' and 'dcommit' commands
 560        no longer require this switch as an argument.
 561
 562-R<remote name>::
 563--svn-remote <remote name>::
 564        Specify the [svn-remote "<remote name>"] section to use,
 565        this allows SVN multiple repositories to be tracked.
 566        Default: "svn"
 567
 568--follow-parent::
 569        This is especially helpful when we're tracking a directory
 570        that has been moved around within the repository, or if we
 571        started tracking a branch and never tracked the trunk it was
 572        descended from. This feature is enabled by default, use
 573        --no-follow-parent to disable it.
 574+
 575[verse]
 576config key: svn.followparent
 577
 578CONFIG FILE-ONLY OPTIONS
 579------------------------
 580
 581svn.noMetadata::
 582svn-remote.<name>.noMetadata::
 583        This gets rid of the 'git-svn-id:' lines at the end of every commit.
 584+
 585If you lose your .git/svn/git-svn/.rev_db file, 'git svn' will not
 586be able to rebuild it and you won't be able to fetch again,
 587either.  This is fine for one-shot imports.
 588+
 589The 'git svn log' command will not work on repositories using
 590this, either.  Using this conflicts with the 'useSvmProps'
 591option for (hopefully) obvious reasons.
 592
 593svn.useSvmProps::
 594svn-remote.<name>.useSvmProps::
 595        This allows 'git svn' to re-map repository URLs and UUIDs from
 596        mirrors created using SVN::Mirror (or svk) for metadata.
 597+
 598If an SVN revision has a property, "svm:headrev", it is likely
 599that the revision was created by SVN::Mirror (also used by SVK).
 600The property contains a repository UUID and a revision.  We want
 601to make it look like we are mirroring the original URL, so
 602introduce a helper function that returns the original identity
 603URL and UUID, and use it when generating metadata in commit
 604messages.
 605
 606svn.useSvnsyncProps::
 607svn-remote.<name>.useSvnsyncprops::
 608        Similar to the useSvmProps option; this is for users
 609        of the svnsync(1) command distributed with SVN 1.4.x and
 610        later.
 611
 612svn-remote.<name>.rewriteRoot::
 613        This allows users to create repositories from alternate
 614        URLs.  For example, an administrator could run 'git svn' on the
 615        server locally (accessing via file://) but wish to distribute
 616        the repository with a public http:// or svn:// URL in the
 617        metadata so users of it will see the public URL.
 618
 619svn.brokenSymlinkWorkaround::
 620        This disables potentially expensive checks to workaround
 621        broken symlinks checked into SVN by broken clients.  Set this
 622        option to "false" if you track a SVN repository with many
 623        empty blobs that are not symlinks.  This option may be changed
 624        while 'git svn' is running and take effect on the next
 625        revision fetched.  If unset, 'git svn' assumes this option to
 626        be "true".
 627
 628Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps
 629options all affect the metadata generated and used by 'git svn'; they
 630*must* be set in the configuration file before any history is imported
 631and these settings should never be changed once they are set.
 632
 633Additionally, only one of these four options can be used per-svn-remote
 634section because they affect the 'git-svn-id:' metadata line.
 635
 636
 637BASIC EXAMPLES
 638--------------
 639
 640Tracking and contributing to the trunk of a Subversion-managed project:
 641
 642------------------------------------------------------------------------
 643# Clone a repo (like git clone):
 644        git svn clone http://svn.example.com/project/trunk
 645# Enter the newly cloned directory:
 646        cd trunk
 647# You should be on master branch, double-check with 'git branch'
 648        git branch
 649# Do some work and commit locally to git:
 650        git commit ...
 651# Something is committed to SVN, rebase your local changes against the
 652# latest changes in SVN:
 653        git svn rebase
 654# Now commit your changes (that were committed previously using git) to SVN,
 655# as well as automatically updating your working HEAD:
 656        git svn dcommit
 657# Append svn:ignore settings to the default git exclude file:
 658        git svn show-ignore >> .git/info/exclude
 659------------------------------------------------------------------------
 660
 661Tracking and contributing to an entire Subversion-managed project
 662(complete with a trunk, tags and branches):
 663
 664------------------------------------------------------------------------
 665# Clone a repo (like git clone):
 666        git svn clone http://svn.example.com/project -T trunk -b branches -t tags
 667# View all branches and tags you have cloned:
 668        git branch -r
 669# Create a new branch in SVN
 670    git svn branch waldo
 671# Reset your master to trunk (or any other branch, replacing 'trunk'
 672# with the appropriate name):
 673        git reset --hard remotes/trunk
 674# You may only dcommit to one branch/tag/trunk at a time.  The usage
 675# of dcommit/rebase/show-ignore should be the same as above.
 676------------------------------------------------------------------------
 677
 678The initial 'git svn clone' can be quite time-consuming
 679(especially for large Subversion repositories). If multiple
 680people (or one person with multiple machines) want to use
 681'git svn' to interact with the same Subversion repository, you can
 682do the initial 'git svn clone' to a repository on a server and
 683have each person clone that repository with 'git clone':
 684
 685------------------------------------------------------------------------
 686# Do the initial import on a server
 687        ssh server "cd /pub && git svn clone http://svn.example.com/project
 688# Clone locally - make sure the refs/remotes/ space matches the server
 689        mkdir project
 690        cd project
 691        git init
 692        git remote add origin server:/pub/project
 693        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
 694        git fetch
 695# Create a local branch from one of the branches just fetched
 696        git checkout -b master FETCH_HEAD
 697# Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
 698        git svn init http://svn.example.com/project
 699# Pull the latest changes from Subversion
 700        git svn rebase
 701------------------------------------------------------------------------
 702
 703REBASE VS. PULL/MERGE
 704---------------------
 705
 706Originally, 'git svn' recommended that the 'remotes/git-svn' branch be
 707pulled or merged from.  This is because the author favored
 708`git svn set-tree B` to commit a single head rather than the
 709`git svn set-tree A..B` notation to commit multiple commits.
 710
 711If you use `git svn set-tree A..B` to commit several diffs and you do
 712not have the latest remotes/git-svn merged into my-branch, you should
 713use `git svn rebase` to update your work branch instead of `git pull` or
 714`git merge`.  `pull`/`merge` can cause non-linear history to be flattened
 715when committing into SVN, which can lead to merge commits reversing
 716previous commits in SVN.
 717
 718DESIGN PHILOSOPHY
 719-----------------
 720Merge tracking in Subversion is lacking and doing branched development
 721with Subversion can be cumbersome as a result.  While 'git svn' can track
 722copy history (including branches and tags) for repositories adopting a
 723standard layout, it cannot yet represent merge history that happened
 724inside git back upstream to SVN users.  Therefore it is advised that
 725users keep history as linear as possible inside git to ease
 726compatibility with SVN (see the CAVEATS section below).
 727
 728CAVEATS
 729-------
 730
 731For the sake of simplicity and interoperating with a less-capable system
 732(SVN), it is recommended that all 'git svn' users clone, fetch and dcommit
 733directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push'
 734operations between git repositories and branches.  The recommended
 735method of exchanging code between git branches and users is
 736'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository.
 737
 738Running 'git merge' or 'git pull' is NOT recommended on a branch you
 739plan to 'dcommit' from.  Subversion does not represent merges in any
 740reasonable or useful fashion; so users using Subversion cannot see any
 741merges you've made.  Furthermore, if you merge or pull from a git branch
 742that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
 743branch.
 744
 745If you do merge, note the following rule: 'git svn dcommit' will
 746attempt to commit on top of the SVN commit named in
 747------------------------------------------------------------------------
 748git log --grep=^git-svn-id: --first-parent -1
 749------------------------------------------------------------------------
 750You 'must' therefore ensure that the most recent commit of the branch
 751you want to dcommit to is the 'first' parent of the merge.  Chaos will
 752ensue otherwise, especially if the first parent is an older commit on
 753the same SVN branch.
 754
 755'git clone' does not clone branches under the refs/remotes/ hierarchy or
 756any 'git svn' metadata, or config.  So repositories created and managed with
 757using 'git svn' should use 'rsync' for cloning, if cloning is to be done
 758at all.
 759
 760Since 'dcommit' uses rebase internally, any git branches you 'git push' to
 761before 'dcommit' on will require forcing an overwrite of the existing ref
 762on the remote repository.  This is generally considered bad practice,
 763see the linkgit:git-push[1] documentation for details.
 764
 765Do not use the --amend option of linkgit:git-commit[1] on a change you've
 766already dcommitted.  It is considered bad practice to --amend commits
 767you've already pushed to a remote repository for other users, and
 768dcommit with SVN is analogous to that.
 769
 770When using multiple --branches or --tags, 'git svn' does not automatically
 771handle name collisions (for example, if two branches from different paths have
 772the same name, or if a branch and a tag have the same name).  In these cases,
 773use 'init' to set up your git repository then, before your first 'fetch', edit
 774the .git/config file so that the branches and tags are associated with
 775different name spaces.  For example:
 776
 777        branches = stable/*:refs/remotes/svn/stable/*
 778        branches = debug/*:refs/remotes/svn/debug/*
 779
 780BUGS
 781----
 782
 783We ignore all SVN properties except svn:executable.  Any unhandled
 784properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
 785
 786Renamed and copied directories are not detected by git and hence not
 787tracked when committing to SVN.  I do not plan on adding support for
 788this as it's quite difficult and time-consuming to get working for all
 789the possible corner cases (git doesn't do it, either).  Committing
 790renamed and copied files are fully supported if they're similar enough
 791for git to detect them.
 792
 793CONFIGURATION
 794-------------
 795
 796'git svn' stores [svn-remote] configuration information in the
 797repository .git/config file.  It is similar the core git
 798[remote] sections except 'fetch' keys do not accept glob
 799arguments; but they are instead handled by the 'branches'
 800and 'tags' keys.  Since some SVN repositories are oddly
 801configured with multiple projects glob expansions such those
 802listed below are allowed:
 803
 804------------------------------------------------------------------------
 805[svn-remote "project-a"]
 806        url = http://server.org/svn
 807        fetch = trunk/project-a:refs/remotes/project-a/trunk
 808        branches = branches/*/project-a:refs/remotes/project-a/branches/*
 809        tags = tags/*/project-a:refs/remotes/project-a/tags/*
 810------------------------------------------------------------------------
 811
 812Keep in mind that the '\*' (asterisk) wildcard of the local ref
 813(right of the ':') *must* be the farthest right path component;
 814however the remote wildcard may be anywhere as long as it's an
 815independent path component (surrounded by '/' or EOL).   This
 816type of configuration is not automatically created by 'init' and
 817should be manually entered with a text-editor or using 'git config'.
 818
 819SEE ALSO
 820--------
 821linkgit:git-rebase[1]
 822
 823Author
 824------
 825Written by Eric Wong <normalperson@yhbt.net>.
 826
 827Documentation
 828-------------
 829Written by Eric Wong <normalperson@yhbt.net>.