summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Tuomas Suutari <tuomas.suutari@gmail.com>2009-08-14 11:11:58 +0300
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-08-18 20:47:11 -0700
commit61f36a79da11accfaaab986bf65453ed30fdbd9f (patch)
tree12d64f2f12e517ffb78a9ae9f5702ecc5308da9e
parentMerge branch 'maint' (diff)
downloadtgif-61f36a79da11accfaaab986bf65453ed30fdbd9f.tar.xz
git-svn.txt: Fix location of parent argument
The note about interoperating in different timezones and such is about localtime argument, not parent. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
-rw-r--r--Documentation/git-svn.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 22a0389f1e..1812890a7e 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -102,9 +102,6 @@ COMMANDS
Store Git commit times in the local timezone instead of UTC. This
makes 'git log' (even without --date=local) show the same times
that `svn log` would in the local timezone.
-
---parent;;
- Fetch only from the SVN parent of the current HEAD.
+
This doesn't interfere with interoperating with the Subversion
repository you cloned from, but if you wish for your local Git
@@ -112,6 +109,9 @@ repository to be able to interoperate with someone else's local Git
repository, either don't use this option or you should both use it in
the same local timezone.
+--parent;;
+ Fetch only from the SVN parent of the current HEAD.
+
--ignore-paths=<regex>;;
This allows one to specify a Perl regular expression that will
cause skipping of all matching paths from checkout from SVN.