path: root/Documentation/git-svn.txt
AgeCommit message (Collapse)Author
2008-02-27Merge branch 'maint'Junio C Hamano
* maint: Eliminate confusing "won't bisect on seeked tree" failure builtin-reflog.c: don't install new reflog on write failure send-email: fix In-Reply-To regression Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR Prompt to continue when editing during rebase --interactive Documentation/git svn log: add a note about timezones. Don't use GIT_CONFIG in t5505-remote Conflicts: t/ t/
2008-02-27Documentation/git svn log: add a note about timezones.Miklos Vajna
git svn log mimics the timezone converting behaviour of svn log, but this was undocumented. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>
2008-02-11Add `git svn blame' commandTim Stoakes
This command is identical to `git blame', but it shows SVN revision numbers instead of git commit hashes. [ew: support "^initial commit" and minor formatting fixes] Signed-off-by: Tim Stoakes <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2008-01-26git-svn(1): update instructions for resuming a git-svn cloneSam Vilain
git-svn expects its references under refs/remotes/*; but these will not be copied or set by "git clone"; put in this man page the manual fiddling that is required with current git-svn to get this to work. Signed-off-by: Sam Vilain <> Signed-off-by: Junio C Hamano <>
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <> Signed-off-by: Junio C Hamano <>
2007-11-22git-svn: info --url [path]David D. Kilzer
Return the svn URL for the given path, or return the svn repository URL if no path is given. Added 18 tests to t/ Signed-off-by: David D. Kilzer <> Acked-by: Eric Wong <>
2007-11-22git-svn info: implement info commandDavid D. Kilzer
Implement "git-svn info" for files and directories based on the "svn info" command. Note that the -r/--revision argument is not supported yet. Added 18 tests in t/ [ew: small fix to work without arguments on all working directories] Signed-off-by: David D. Kilzer <> Acked-by: Eric Wong <>
2007-10-16Fix some typos, punctuation, missing words, minor markup.Ralf Wildenhues
Signed-off-by: Lars Hjemli <> Signed-off-by: Shawn O. Pearce <>
2007-09-19Documentation/git-svn: updated design philosophy notesEric Wong
This section has not been updated in a while and --branches/--tags/--trunk options are commonly used nowadays. Noticed-by: Lars Hjemli <> Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-08-29git-svn.txt: fix an obvious misspelling.David Kastrup
Signed-off-by: David Kastrup <> Signed-off-by: Junio C Hamano <>
2007-08-25Documentation: Correct various misspellings and typos.Brian Hetro
Fix minor typos throughout the documentation. Signed-off-by: Brian Hetro <> Signed-off-by: Junio C Hamano <>
2007-08-23git-svn init/clone --stdlayout option to default-init trunk/tags/branchesmartin f. krafft
The --stdlayout option to git-svn init/clone initialises the default Subversion values of trunk,tags,branches: -T trunk -b branches -t tags. If any of the -T/-t/-b options are given in addition, they are given preference. [ew: fixed whitespace and added "-s" shortcut] Signed-off-by: martin f. krafft <> Signed-off-by: Eric Wong <>
2007-08-22git-svn: update documentation with CAVEATS sectionEric Wong
Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-08-06Documentation/git-svn: how to clone a git-svn-created repositoryAdam Roben
These instructions tell you how to create a clone of a repository created with git-svn, that can in turn be used with git-svn. Signed-off-by: Adam Roben <> Signed-off-by: Junio C Hamano <>
2007-06-24git-svn: trailing slash in prefix is mandatory with --branches/-bGerrit Pape
Make clear in the documentation that when using --branches/-b and --prefix with 'init', the prefix must include a trailing slash. This matches the actual behavior of git-svn, e.g.: $ git svn init -Ttrunk -treleases -bbranches --prefix xxx \ --prefix='xxx' must have a trailing slash '/' $ This was noticed by R. Vanicat and reported through Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2007-05-04Add --no-rebase option to git-svn dcommitKarl Hasselström
git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-05-04Fix markup in git-svn man pageKarl Hasselström
Some of the existing markup was just plain broken, and some subcommand options weren't indented properly. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2007-04-30git-svn: Add 'find-rev' commandAdam Roben
This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-04-28git-svn: Added 'find-rev' commandAdam Roben
This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-03-14git-svn: add -l/--local command to "git svn rebase"Eric Wong
This avoids fetching new revisions remotely, and is usefuly versus plain "git rebase" because the user does not have to specify which remote head to rebase against. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-03-01Documentation/git-svn.txt: Fix formatting errorsSergey Vlasov
Fix some formatting problems: - Some list labels were missing their "::" characters. - Some of continuation paragraphs in labeled lists were incorrectly formatted as literal paragraphs. - In one case "[verse]" was missing before the config key list. - The "Basic Examples" section was incorrectly nested inside the "Config File-Only Options" section. Signed-off-by: Sergey Vlasov <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-03-01fix various doc typosMichael Coleman
Signed-off-by: Junio C Hamano <>
2007-02-23git-svn: document --usernameSam Vilain
Also, it turns out that SVN::Ra doesn't attempt to deal with authentication or pass the username to ssh when doing svn+ssh:// URLs Signed-off-by: Eric Wong <>
2007-02-23git-svn: allow metadata options to be specified with 'init' and 'clone'Eric Wong
Since the options that affect the way metadata is handled in git-svn, should be consistently set/unset throughout history imported by git-svn; it makes sense to allow the user to set certain options from the command-line that will write to the config file when initially creating the repository. Also, fix some formatting issues while we're updating documentation. Signed-off-by: Eric Wong <>
2007-02-23git-svn: documentation updatesEric Wong
This documents the 'clone' and 'rebase' commands of git-svn. Additionaly, examples are updated to use them instead of the lower-level 'init' and 'fetch' commands. Signed-off-by: Eric Wong <>
2007-02-23git-svn: documentation updates for new functionalityEric Wong
Force the showing of the --minimize flag as an option in the 'migrate' help. Also, fix the usage function to correctly filter out the deprecated aliases. Signed-off-by: Eric Wong <>
2007-02-23git-svn: extra safety for noMetadata and useSvmProps usersEric Wong
Make sure we flush our userspace buffers and and fsync(2) .rev_db information to disk if we use these options because we really don't want to lose this information. Also, disallow --use-svm-props and --no-metadata from the command-line because history will be inconsistent if they're only used occasionally. If a user wants to use these options, they must be set in the config so they're always on. Signed-off-by: Eric Wong <>
2007-02-23git-svn: enable follow-parent functionality by defaultEric Wong
--no-follow-parent disables and reverts it back to the old default behavior of not following parents (if you don't care for full history). Signed-off-by: Eric Wong <>
2007-02-23git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanupsEric Wong
--svn-remote allows the default remote name to be overridden (useful for tracking multiple SVN repositories). Signed-off-by: Eric Wong <>
2007-02-23git-svn: remove the 'rebuild' command and make the functionality automaticEric Wong
Since refs/remotes/* are not automatically cloned, we expect the user to be capable of copying those references themselves anyways. Also removed the documentation for --ignore-nodate while we're at it; it has also been made automatic. Signed-off-by: Eric Wong <>
2007-02-23git-svn: get rid of additional fetch-argumentsEric Wong
It's not really useful anymore now that we have a better --follow-parent for the valid cases. Any other use of it is not valid. Signed-off-by: Eric Wong <>
2007-02-04Assorted typo fixesPavel Roskin
Signed-off-by: Junio C Hamano <>
2007-01-29[PATCH] Rename git-repo-config to git-config.Tom Prince
Signed-off-by: Tom Prince <> Signed-off-by: Junio C Hamano <>
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano
Also reorders a handful entries to make each list sorted alphabetically. Signed-off-by: Junio C Hamano <>
2007-01-17Documentation: a few spelling fixesRené Scharfe
Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2007-01-12use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre
While 'init-db' still is and probably will always remain a valid git command for obvious backward compatibility reasons, it would be a good idea to move shipped tools and docs to using 'init' instead. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-01-10Update git-svn manpage to remove the implication that SVN::* is optional.Steven Grimm
Now that git-svn requires the SVN::* Perl library, the manpage doesn't need to describe what happens when you don't have it. Signed-off-by: Steven Grimm <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-01-08git-svn: add --prefix= option to multi-initEric Wong
Also, document --{trunk,branches,tags} options while we're documenting multi-init options. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-01-07Documentation/git-svn: clarify dcommit, rebase vs pull/mergeEric Wong
Clarify that dcommit creates a revision in SVN for every commit in git. Also, add 'merge' to the rebase vs pull section because git-merge is now a first-class UI. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-01-05git-svn: update documentation for multi-{init|fetch}Eric Wong
Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-12-16git-svn: rename 'commit' command to 'set-tree'Eric Wong
'set-tree' probably accurately describes what the command formerly known as 'commit' does. I'm not entirely sure that 'dcommit' should be renamed to 'commit' just yet... Perhaps 'push' or 'push-changes'? Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-12-13git-svn: allow dcommit to take an alternate headEric Wong
Previously dcommit would unconditionally commit all patches up-to and including the current HEAD. Now if an optional command-line argument is specified, it will only commit up to the specified revision. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-11-29git-svn: documentation updatesEric Wong
Eliminate 'commit' from some places and plug 'dcommit' more. Also update the section --id (GIT_SVN_ID) usage since we have multi-init/multi-fetch now. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-11-09git-svn: fix dcommit losing changes when out-of-date from svnEric Wong
There was a bug in dcommit (and commit-diff) which caused deltas to be generated against the latest version of the changed file in a repository, and not the revision we are diffing (the tree) against locally. This bug can cause recent changes to the svn repository to be silently clobbered by git-svn if our repository is out-of-date. Thanks to Steven Grimm for noticing the bug. The (few) people using the commit-diff command are now required to use the -r/--revision argument. dcommit usage is unchanged. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-10-11Documentation/git-svn: document some of the newer featuresEric Wong
I've forgotten to document many of the features added along the way in the manpages. This fills in some holes in the documentation and adds updates some outdated information. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-09-25Allow 'svn fetch' on '(no date)' revisions in Subversion.Shawn Pearce
Added --ignore-nodate to allow 'git svn fetch' to import revisions from Subversion which have '(no date)' listed as the date of the revision. By default 'git svn fetch' will crash with an error when encountering such a revision. The user may restart the fetch operation by adding --ignore-nodate if they want to continue tracking that repository. I'm not entirely sure why a centralized version control system such as Subversion permits revisions to be created with absolutely no date/time associated with it but it apparently is possible as one of the Subversion repositories that I'm tracking with 'git svn' created such a revision on '(no date)' and by '(no user)'. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2006-08-26git-svn: add the 'dcommit' commandEric Wong
This is a high-level wrapper around the 'commit-diff' command and used to produce cleaner history against the mirrored repository through rebase/reset usage. It's basically a more polished version of this: for i in `git rev-list --no-merges remotes/git-svn..HEAD | tac`; do git-svn commit-diff $i~1 $i done git reset --hard remotes/git-svn Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-08-26git-svn: recommend rebase for syncing against an SVN repoEric Wong
Does this make sense to other git-svn users out there? pull can give funky history unless you understand how git-svn works internally, which users should not be expected to do. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-08-26git-svn(1): improve asciidoc markupJonas Fonseca
Use list continuation to have better wrapping. This accounts for most of the changes because it reindents a lot of text without applying other changes. Use cross-referencing for interlinking and the gitlink macro for pointing to other tools in the git suite. Signed-off-by: Jonas Fonseca <> Signed-off-by: Junio C Hamano <>
2006-07-09Fix some doubled word typosAlp Toker
Signed-off-by: Alp Toker <> Signed-off-by: Junio C Hamano <>