From 4bf6dca5740a97dca7ed3a80bcae9fd983881bb6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 21 Dec 2006 02:25:57 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.3-gc902c --- git-clone.html | 27 ++------------------------- git-clone.txt | 15 +-------------- git-diff.html | 6 +++--- git-diff.txt | 4 ++-- git-svn.html | 22 +++++++++++----------- git-svn.txt | 20 ++++++++++---------- 6 files changed, 29 insertions(+), 65 deletions(-) diff --git a/git-clone.html b/git-clone.html index c6fd744f4..d0f352444 100644 --- a/git-clone.html +++ b/git-clone.html @@ -275,8 +275,7 @@ git-clone(1) Manual Page
git-clone [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] [--reference <repository>] - [--use-separate-remote | --no-separate-remote] <repository> - [<directory>]
+ <repository> [<directory>]

DESCRIPTION

@@ -417,28 +416,6 @@ configuration variables.

---use-separate-remote -
-
-

- Save remotes heads under $GIT_DIR/refs/remotes/origin/ instead - of $GIT_DIR/refs/heads/. Only the local master branch is - saved in the latter. This is the default. -

-
-
---no-separate-remote -
-
-

- Save remotes heads in the same namespace as the local - heads, `$GIT_DIR/refs/heads/'. In regular repositories, - this is a legacy setup git-clone created by default in - older Git versions, and will be removed before the next - major release. -

-
-
<repository>
@@ -533,7 +510,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index bfddb21fe..874934a33 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -11,8 +11,7 @@ SYNOPSIS [verse] 'git-clone' [--template=] [-l [-s]] [-q] [-n] [--bare] [-o ] [-u ] [--reference ] - [--use-separate-remote | --no-separate-remote] - [] + [] DESCRIPTION ----------- @@ -99,18 +98,6 @@ OPTIONS if unset the templates are taken from the installation defined default, typically `/usr/share/git-core/templates`. ---use-separate-remote:: - Save remotes heads under `$GIT_DIR/refs/remotes/origin/` instead - of `$GIT_DIR/refs/heads/`. Only the local master branch is - saved in the latter. This is the default. - ---no-separate-remote:: - Save remotes heads in the same namespace as the local - heads, `$GIT_DIR/refs/heads/'. In regular repositories, - this is a legacy setup git-clone created by default in - older Git versions, and will be removed before the next - major release. - :: The (possibly remote) repository to clone from. It can be any URL git-fetch supports. diff --git a/git-diff.html b/git-diff.html index bb0816db1..5bcb2969e 100644 --- a/git-diff.html +++ b/git-diff.html @@ -272,7 +272,7 @@ git-diff(1) Manual Page

SYNOPSIS

-

git-diff [ --diff-options ] <tree-ish>{0,2} [--] [<path>…]

+

git-diff [ --diff-options ] <commit>{0,2} [--] [<path>…]

DESCRIPTION

@@ -297,7 +297,7 @@ tree and the index file, or the index file and the working tree.

This form is to view the changes you staged for the next - commit relative to the named <tree-ish>. Typically you + commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.

@@ -815,7 +815,7 @@ output diff in reverse.
diff --git a/git-diff.txt b/git-diff.txt index 10fdf88dc..8977877b2 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [ --diff-options ] {0,2} [--] [...] +'git-diff' [ --diff-options ] {0,2} [--] [...] DESCRIPTION ----------- @@ -26,7 +26,7 @@ tree and the index file, or the index file and the working tree. 'git-diff' [--options] --cached [] [--] [...]:: This form is to view the changes you staged for the next - commit relative to the named . Typically you + commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. diff --git a/git-svn.html b/git-svn.html index 367353319..ea7c74d89 100644 --- a/git-svn.html +++ b/git-svn.html @@ -336,7 +336,7 @@ manually joining branches on commit.

against the latest changes in the SVN repository. An optional command-line argument may be specified as an alternative to HEAD. - This is advantageous over commit (below) because it produces + This is advantageous over set-tree (below) because it produces cleaner, more linear history.

@@ -378,7 +378,7 @@ manually joining branches on commit.

-commit +set-tree

@@ -510,7 +510,7 @@ documentation for more details.

-Only used with the commit command. +Only used with the set-tree command.

Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so @@ -521,7 +521,7 @@ git-rev-list --pretty=oneline output can be used.

-Only used with the dcommit, commit and commit-diff commands. +Only used with the dcommit, set-tree and commit-diff commands.

Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not @@ -538,7 +538,7 @@ the commit to SVN act like git.

-Only used with the dcommit, commit and commit-diff commands. +Only used with the dcommit, set-tree and commit-diff commands.

Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing @@ -553,7 +553,7 @@ tree objects.

-Only used with the dcommit, commit and commit-diff commands. +Only used with the dcommit, set-tree and commit-diff commands.

They are both passed directly to git-diff-tree see git-diff-tree(1) for more information.

@@ -662,7 +662,7 @@ which diffs would be committed to SVN.

-Used with fetch, dcommit or commit. +Used with fetch, dcommit or set-tree.

This can be used to join arbitrary git branches to remotes/git-svn on new commits where the tree object is equivalent.

@@ -797,10 +797,10 @@ SVN was very wrong.

REBASE VS. PULL

Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored git-svn commit B -to commit a single head rather than the git-svn commit A..B notation +pulled from. This is because the author favored git-svn set-tree B +to commit a single head rather than the git-svn set-tree A..B notation to commit multiple commits.

-

If you use git-svn commit A..B to commit several diffs and you do not +

If you use git-svn set-tree A..B to commit several diffs and you do not have the latest remotes/git-svn merged into my-branch, you should use git rebase to update your work branch instead of git pull. pull can cause non-linear history to be flattened when committing into SVN, @@ -907,7 +907,7 @@ detect them.

diff --git a/git-svn.txt b/git-svn.txt index c589a9863..f5f57e8f8 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -64,7 +64,7 @@ manually joining branches on commit. against the latest changes in the SVN repository. An optional command-line argument may be specified as an alternative to HEAD. - This is advantageous over 'commit' (below) because it produces + This is advantageous over 'set-tree' (below) because it produces cleaner, more linear history. 'log':: @@ -89,7 +89,7 @@ manually joining branches on commit. Any other arguments are passed directly to `git log' -'commit':: +'set-tree':: You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up-to-date. This makes @@ -172,7 +172,7 @@ This can allow you to make partial mirrors when running fetch. -:: --stdin:: -Only used with the 'commit' command. +Only used with the 'set-tree' command. Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so @@ -180,7 +180,7 @@ git-rev-list --pretty=oneline output can be used. --rmdir:: -Only used with the 'dcommit', 'commit' and 'commit-diff' commands. +Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not @@ -193,7 +193,7 @@ repo-config key: svn.rmdir -e:: --edit:: -Only used with the 'dcommit', 'commit' and 'commit-diff' commands. +Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing @@ -204,7 +204,7 @@ repo-config key: svn.edit -l:: --find-copies-harder:: -Only used with the 'dcommit', 'commit' and 'commit-diff' commands. +Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. They are both passed directly to git-diff-tree see gitlink:git-diff-tree[1] for more information. @@ -276,7 +276,7 @@ ADVANCED OPTIONS -b:: --branch :: -Used with 'fetch', 'dcommit' or 'commit'. +Used with 'fetch', 'dcommit' or 'set-tree'. This can be used to join arbitrary git branches to remotes/git-svn on new commits where the tree object is equivalent. @@ -392,11 +392,11 @@ REBASE VS. PULL --------------- Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored 'git-svn commit B' -to commit a single head rather than the 'git-svn commit A..B' notation +pulled from. This is because the author favored 'git-svn set-tree B' +to commit a single head rather than the 'git-svn set-tree A..B' notation to commit multiple commits. -If you use 'git-svn commit A..B' to commit several diffs and you do not +If you use 'git-svn set-tree A..B' to commit several diffs and you do not have the latest remotes/git-svn merged into my-branch, you should use 'git rebase' to update your work branch instead of 'git pull'. 'pull' can cause non-linear history to be flattened when committing into SVN, -- 2.26.2