From: Junio C Hamano Date: Thu, 22 Jun 2006 19:49:35 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.1-rc1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97f518c4cae23baaa8a9731a830793ae23f97fc7;p=git.git Autogenerated HTML docs for v1.4.1-rc1 --- diff --git a/git-clone-pack.txt b/git-clone-pack.txt deleted file mode 100644 index 09f43eefe..000000000 --- a/git-clone-pack.txt +++ /dev/null @@ -1,64 +0,0 @@ -git-clone-pack(1) -================= - -NAME ----- -git-clone-pack - Clones a repository by receiving packed objects - - -SYNOPSIS --------- -'git-clone-pack' [--exec=] [:] [...] - -DESCRIPTION ------------ -Clones a repository into the current repository by invoking -'git-upload-pack', possibly on the remote host via ssh, in -the named repository, and stores the sent pack in the local -repository. - -OPTIONS -------- ---exec=:: - Use this to specify the path to 'git-upload-pack' on the - remote side, if it is not found on your $PATH. - Installations of sshd ignore the user's environment - setup scripts for login shells (e.g. .bash_profile) and - your privately installed git may not be found on the system - default $PATH. Another workaround suggested is to set - up your $PATH in ".bashrc", but this flag is for people - who do not want to pay the overhead for non-interactive - shells by having a lean .bashrc file (they set most of - the things up in .bash_profile). - -:: - A remote host that houses the repository. When this - part is specified, 'git-upload-pack' is invoked via - ssh. - -:: - The repository to sync from. - -...:: - The heads to update. This is relative to $GIT_DIR - (e.g. "HEAD", "refs/heads/master"). When unspecified, - all heads are updated to match the remote repository. -+ -Usually all the refs from existing repository are stored -under the same name in the new repository. Giving explicit - arguments instead writes the object names and refs to -the standard output, just like get-fetch-pack does. - -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano. - - -GIT ---- -Part of the gitlink:git[7] suite - diff --git a/git-clone.html b/git-clone.html index 02e4ee40d..763a841db 100644 --- a/git-clone.html +++ b/git-clone.html @@ -351,7 +351,7 @@ branch you are currently working on. Remote branches other than

Operate quietly. This flag is passed to "rsync" and - "git-clone-pack" commands when given. + "git-fetch-pack" commands when given.

@@ -396,7 +396,7 @@ branch you are currently working on. Remote branches other than

When given, and the repository to clone from is handled - by git-clone-pack, --exec=<upload-pack> is passed to + by git-fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end.

@@ -516,7 +516,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index a90521e51..f973c6431 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -62,7 +62,7 @@ OPTIONS --quiet:: -q:: Operate quietly. This flag is passed to "rsync" and - "git-clone-pack" commands when given. + "git-fetch-pack" commands when given. -n:: No checkout of HEAD is performed after the clone is complete. @@ -85,7 +85,7 @@ OPTIONS --upload-pack :: -u :: When given, and the repository to clone from is handled - by 'git-clone-pack', '--exec=' is passed to + by 'git-fetch-pack', '--exec=' is passed to the command to specify non-default path for the command run on the other end. diff --git a/git-rebase.html b/git-rebase.html index 974d59738..9f72b6f55 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -272,7 +272,7 @@ git-rebase(1) Manual Page

SYNOPSIS

-

git-rebase [--onto <newbase>] <upstream> [<branch>]

+

git-rebase [--merge] [--onto <newbase>] <upstream> [<branch>]

git-rebase --continue | --skip | --abort

DESCRIPTION

@@ -390,6 +390,95 @@ desired resolution, you can continue the rebasing process with

Restore the original branch and abort the rebase operation.

+
+--skip +
+
+

+ Restart the rebasing process by skipping the current patch. + This does not work with the --merge option. +

+
+
+--merge +
+
+

+ Use merging strategies to rebase. When the recursive (default) merge + strategy is used, this allows rebase to be aware of renames on the + upstream side. +

+
+
+-s <strategy>, --strategy=<strategy> +
+
+

+ Use the given merge strategy; can be supplied more than + once to specify them in the order they should be tried. + If there is no -s option, a built-in list of strategies + is used instead (git-merge-recursive when merging a single + head, git-merge-octopus otherwise). This implies --merge. +

+
+ + +

MERGE STRATEGIES

+
+
+
+resolve +
+
+

+ This can only resolve two heads (i.e. the current branch + and another branch you pulled from) using 3-way merge + algorithm. It tries to carefully detect criss-cross + merge ambiguities and is considered generally safe and + fast. +

+
+
+recursive +
+
+

+ This can only resolve two heads using 3-way merge + algorithm. When there are more than one common + ancestors that can be used for 3-way merge, it creates a + merged tree of the common ancestors and uses that as + the reference tree for the 3-way merge. This has been + reported to result in fewer merge conflicts without + causing mis-merges by tests done on actual merge commits + taken from Linux 2.6 kernel development history. + Additionally this can detect and handle merges involving + renames. This is the default merge strategy when + pulling or merging one branch. +

+
+
+octopus +
+
+

+ This resolves more than two-head case, but refuses to do + complex merge that needs manual resolution. It is + primarily meant to be used for bundling topic branch + heads together. This is the default merge strategy when + pulling or merging more than one branches. +

+
+
+ours +
+
+

+ This resolves any number of heads, but the result of the + merge is always the current branch head. It is meant to + be used to supersede old development history of side + branches. +

+

NOTES

@@ -420,7 +509,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-rebase.txt b/git-rebase.txt index 08ee4aaba..c339c4525 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head SYNOPSIS -------- -'git-rebase' [--onto ] [] +'git-rebase' [--merge] [--onto ] [] 'git-rebase' --continue | --skip | --abort @@ -106,6 +106,24 @@ OPTIONS --abort:: Restore the original branch and abort the rebase operation. +--skip:: + Restart the rebasing process by skipping the current patch. + This does not work with the --merge option. + +--merge:: + Use merging strategies to rebase. When the recursive (default) merge + strategy is used, this allows rebase to be aware of renames on the + upstream side. + +-s , \--strategy=:: + Use the given merge strategy; can be supplied more than + once to specify them in the order they should be tried. + If there is no `-s` option, a built-in list of strategies + is used instead (`git-merge-recursive` when merging a single + head, `git-merge-octopus` otherwise). This implies --merge. + +include::merge-strategies.txt[] + NOTES ----- When you rebase a branch, you are changing its history in a way that diff --git a/git-receive-pack.html b/git-receive-pack.html index 820c8a5fe..612fcb76a 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -3,7 +3,7 @@ - +