- correctly link paragraphs within list items
- consistently format examples
- put option alernatives on separate lines
- always use [verse] for config items
- always indent 1st paragraph of a list item, with a tab
Signed-off-by: Yann Dirson <ydirson@altern.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This fetches revisions from the SVN parent of the current HEAD
and rebases the current (uncommitted to SVN) work against it.
+
This works similarly to `svn update` or 'git pull' except that
it preserves linear history with 'git rebase' instead of
'git merge' for ease of dcommitting with 'git svn'.
+
This accepts all options that 'git svn fetch' and 'git rebase'
accept. However, '--fetch-all' only fetches from the current
[svn-remote], and not all [svn-remote] definitions.
+
Like 'git rebase'; this requires that the working tree be clean
and have no uncommitted changes.
@ -186,14 +193,13 @@ and have no uncommitted changes.
@@ -186,14 +193,13 @@ and have no uncommitted changes.
method (e.g. `svn://` or `http://` for anonymous read) to be
reused if a user is later given access to an alternate transport
method (e.g. `svn+ssh://` or `https://`) for commit.
+
[verse]
config key: svn-remote.<name>.commiturl
config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
Using this option for any other purpose (don't ask)
is very strongly discouraged.
--
+
Using this option for any other purpose (don't ask) is very strongly
discouraged.
'branch'::
Create a branch in the SVN repository.
@ -232,10 +238,12 @@ where <name> is the name of the SVN repository as specified by the -R option to
@@ -232,10 +238,12 @@ where <name> is the name of the SVN repository as specified by the -R option to
The following features from `svn log' are supported:
+
--
-r/--revision=<n>[:<n>];;
-r <n>[:<n>];;
--revision=<n>[:<n>];;
is supported, non-numeric args are not:
HEAD, NEXT, BASE, PREV, etc ...
-v/--verbose;;
-v;;
--verbose;;
it's not completely compatible with the --verbose
output in svn log, but reasonably close.
--limit=<n>;;
@ -274,7 +282,6 @@ Any other arguments are passed directly to 'git log'
@@ -274,7 +282,6 @@ Any other arguments are passed directly to 'git log'
changes that haven't been committed to SVN (including local
working-copy edits) are shown as revision 0.
--
'find-rev'::
When given an SVN revision number of the form 'rN', returns the
corresponding git commit hash (this can optionally be followed by a
@ -340,58 +347,56 @@ Any other arguments are passed directly to 'git log'
@@ -340,58 +347,56 @@ Any other arguments are passed directly to 'git log'
"checksum mismatch" (missed a modification). If the problem
file cannot be ignored forever (with --ignore-paths) the only
way to repair the repo is to use 'reset'.
+
Only the rev_map and refs/remotes/git-svn are changed. Follow 'reset'
with a 'fetch' and then 'git reset' or 'git rebase' to move local
branches onto the new tree.
-r/--revision=<n>;;
-r <n>;;
--revision=<n>;;
Specify the most recent revision to keep. All later revisions
are discarded.
-p/--parent;;
-p;;
--parent;;
Discard the specified revision as well, keeping the nearest
parent instead.
Example:;;
Assume you have local changes in "master", but you need to refetch "r2".
+
------------
r1---r2---r3 remotes/git-svn
\
A---B master
------------
+
Fix the ignore-paths or SVN permissions problem that caused "r2" to
be incomplete in the first place. Then:
+
[verse]
git svn reset -r2 -p
git svn fetch
+
------------
r1---r2'--r3' remotes/git-svn
\
r2---r3---A---B master
------------
+
Then fixup "master" with 'git rebase'.
Do NOT use 'git merge' or your history will not be compatible with a
Yann Dirson
16 years ago
committed by