From 1de7bc66ff223ead40644fccf6579da5a5a6421c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Dec 2006 19:31:54 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.2-gee60 --- git-clone.html | 4 +- git-clone.txt | 2 +- git-merge-file.html | 384 ++++++++++++++++++++++++++++++++++++++++++++ git-merge-file.txt | 92 +++++++++++ git-svnimport.html | 22 ++- git-svnimport.txt | 13 +- git.html | 10 +- git.txt | 3 + 8 files changed, 518 insertions(+), 12 deletions(-) create mode 100644 git-merge-file.html create mode 100644 git-merge-file.txt diff --git a/git-clone.html b/git-clone.html index d6f6c573f..c6fd744f4 100644 --- a/git-clone.html +++ b/git-clone.html @@ -421,7 +421,7 @@ configuration variables.

- Save remotes heads under $GIT_DIR/remotes/origin/ instead + 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.

@@ -533,7 +533,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 985043fac..bfddb21fe 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -100,7 +100,7 @@ OPTIONS defined default, typically `/usr/share/git-core/templates`. --use-separate-remote:: - Save remotes heads under `$GIT_DIR/remotes/origin/` instead + 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. diff --git a/git-merge-file.html b/git-merge-file.html new file mode 100644 index 000000000..e74295b3d --- /dev/null +++ b/git-merge-file.html @@ -0,0 +1,384 @@ + + + + + + +git-merge-file(1) + + + +

SYNOPSIS

+
+
+
git-merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]] + [-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file>
+
+

DESCRIPTION

+
+

git-file-merge incorporates all changes that lead from the <base-file> +to <other-file> into <current-file>. The result ordinarily goes into +<current-file>. git-merge-file is useful for combining separate changes +to an original. Suppose <base-file> is the original, and both +<current-file> and <other-file> are modifications of <base-file>. +Then git-merge-file combines both changes.

+

A conflict occurs if both <current-file> and <other-file> have changes +in a common segment of lines. If a conflict is found, git-merge-file +normally outputs a warning and brackets the conflict with <<<<<<< and +>>>>>>> lines. A typical conflict will look like this:

+
+
+
<<<<<<< A
+lines in file A
+=======
+lines in file B
+>>>>>>> B
+
+

If there are conflicts, the user should edit the result and delete one of +the alternatives.

+

The exit value of this program is negative on error, and the number of +conflicts otherwise. If the merge was clean, the exit value is 0.

+

git-merge-file is designed to be a minimal clone of RCS merge, that is, it +implements all of RCS merge's functionality which is needed by +git(1).

+
+

OPTIONS

+
+
+
+-L <label> +
+
+

+ This option may be given up to three times, and + specifies labels to be used in place of the + corresponding file names in conflict reports. That is, + git-merge-file -L x -L y -L z a b c generates output that + looks like it came from files x, y and z instead of + from files a, b and c. +

+
+
+-p +
+
+

+ Send results to standard output instead of overwriting + <current-file>. +

+
+
+-q +
+
+

+ Quiet; do not warn about conflicts. +

+
+
+
+

EXAMPLES

+
+
+
+git merge-file README.my README README.upstream +
+
+

+ combines the changes of README.my and README.upstream since README, + tries to merge them and writes the result into README.my. +

+
+
+git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345 +
+
+

+ merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels + a and c instead of tmp/a123 and tmp/c345. +

+
+
+
+

Author

+
+

Written by Johannes Schindelin <johannes.schindelin@gmx.de>

+
+

Documentation

+
+

Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, +with parts copied from the original documentation of RCS merge.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + + diff --git a/git-merge-file.txt b/git-merge-file.txt new file mode 100644 index 000000000..29d3faa55 --- /dev/null +++ b/git-merge-file.txt @@ -0,0 +1,92 @@ +git-merge-file(1) +================= + +NAME +---- +git-merge-file - three-way file merge + + +SYNOPSIS +-------- +[verse] +'git-merge-file' [-L [-L [-L ]]] + [-p|--stdout] [-q|--quiet] + + +DESCRIPTION +----------- +git-file-merge incorporates all changes that lead from the `` +to `` into ``. The result ordinarily goes into +``. git-merge-file is useful for combining separate changes +to an original. Suppose `` is the original, and both +`` and `` are modifications of ``. +Then git-merge-file combines both changes. + +A conflict occurs if both `` and `` have changes +in a common segment of lines. If a conflict is found, git-merge-file +normally outputs a warning and brackets the conflict with <<<<<<< and +>>>>>>> lines. A typical conflict will look like this: + + <<<<<<< A + lines in file A + ======= + lines in file B + >>>>>>> B + +If there are conflicts, the user should edit the result and delete one of +the alternatives. + +The exit value of this program is negative on error, and the number of +conflicts otherwise. If the merge was clean, the exit value is 0. + +git-merge-file is designed to be a minimal clone of RCS merge, that is, it +implements all of RCS merge's functionality which is needed by +gitlink:git[1]. + + +OPTIONS +------- + +-L
+
+-P <path_from_trunk> +
+
+

+ Partial import of the SVN tree. +

+

By default, the whole tree on the SVN trunk (/trunk) is imported. +-P my/proj will import starting only from /trunk/my/proj. +This option is useful when you want to import one project from a +svn repo which hosts multiple projects under the same trunk.

-v @@ -512,7 +522,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index b1b87c2fc..2c7c7dad5 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -15,6 +15,7 @@ SYNOPSIS [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] [ -I ] [ -A ] + [ -P ] [ ] @@ -103,9 +104,17 @@ repository without -A. -l :: Specify a maximum revision number to pull. ++ +Formerly, this option controlled how many revisions to pull, +due to SVN memory leaks. (These have been worked around.) - Formerly, this option controlled how many revisions to pull, - due to SVN memory leaks. (These have been worked around.) +-P :: + Partial import of the SVN tree. ++ +By default, the whole tree on the SVN trunk (/trunk) is imported. +'-P my/proj' will import starting only from '/trunk/my/proj'. +This option is useful when you want to import one project from a +svn repo which hosts multiple projects under the same trunk. -v:: Verbosity: let 'svnimport' report what it is doing. diff --git a/git.html b/git.html index 09ada9751..31f3107ef 100644 --- a/git.html +++ b/git.html @@ -1037,6 +1037,14 @@ repositories.

+git-merge-file(1) +
+
+

+ Runs a threeway merge. +

+
+
git-merge-index(1)
@@ -2261,7 +2269,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 6382ef0a0..2a9e97dac 100644 --- a/git.txt +++ b/git.txt @@ -351,6 +351,9 @@ gitlink:git-init-db[1]:: Creates an empty git object database, or reinitialize an existing one. +gitlink:git-merge-file[1]:: + Runs a threeway merge. + gitlink:git-merge-index[1]:: Runs a merge for files needing merging. -- 2.26.2