diff options
| author |  Jeff King <peff@peff.net> | 2012-10-25 06:42:01 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 06:42:02 -0400 |
| commit | 530f237500ba00c03fee23c2db599870ff62c196 (patch) | |
| tree | 99a83551dc7c6107adca22d3f7a3b360ccc5909d /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'jm/diff-context-config' (diff) | |
| parent | Add a test script for remote-svn (diff) | |
| download | tgif-530f237500ba00c03fee23c2db599870ff62c196.tar.xz | |
Merge branch 'fa/remote-svn'
A GSoC project.
* fa/remote-svn:
Add a test script for remote-svn
remote-svn: add marks-file regeneration
Add a svnrdump-simulator replaying a dump file for testing
remote-svn: add incremental import
remote-svn: Activate import/export-marks for fast-import
Create a note for every imported commit containing svn metadata
vcs-svn: add fast_export_note to create notes
Allow reading svn dumps from files via file:// urls
remote-svn, vcs-svn: Enable fetching to private refs
When debug==1, start fast-import with "--stats" instead of "--quiet"
Add documentation for the 'bidi-import' capability of remote-helpers
Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
Add argv_array_detach and argv_array_free_detached
Add svndump_init_fd to allow reading dumps from arbitrary FDs
Add git-remote-testsvn to Makefile
Implement a remote helper for svn in C
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions