git-mergetool(1)

From 103ad7fa163b20b6629d6162e5b261a124e1e486 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2007 11:19:26 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0.3-438-gc49b2 --- cmds-ancillarymanipulators.txt | 3 + config.txt | 5 + git-branch.html | 10 +- git-branch.txt | 9 +- git-checkout.html | 27 ++- git-checkout.txt | 15 +- git-config.html | 12 +- git-cvsserver.html | 43 ++++- git-cvsserver.txt | 19 +- git-mergetool.html | 326 +++++++++++++++++++++++++++++++++ git-mergetool.txt | 46 +++++ git-svn.html | 20 +- git-svn.txt | 8 + git.html | 10 +- 14 files changed, 527 insertions(+), 26 deletions(-) create mode 100644 git-mergetool.html create mode 100644 git-mergetool.txt diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt index 56d388ef7..28d44fa99 100644 --- a/cmds-ancillarymanipulators.txt +++ b/cmds-ancillarymanipulators.txt @@ -7,6 +7,9 @@ gitlink:git-fast-import[1]:: gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. +gitlink:git-mergetool[1]:: + Run merge conflict resolution tools to resolve merge conflicts. + gitlink:git-pack-refs[1]:: Pack heads and tags for efficient repository access. diff --git a/config.txt b/config.txt index 5408dd67d..aaae9ac30 100644 --- a/config.txt +++ b/config.txt @@ -453,6 +453,11 @@ merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.tool:: + Controls which merge resolution program is used by + gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", + "meld", "xxdiff", "emerge" + merge.verbosity:: Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error diff --git a/git-branch.html b/git-branch.html index 937b288d1..bd07c6531 100644 --- a/git-branch.html +++ b/git-branch.html @@ -275,7 +275,7 @@ git-branch(1) Manual Page

@@ -289,6 +289,12 @@ and option -a shows both.

It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head equal to that of the currently checked out branch.

When a local branch is started off a remote branch, git can setup the +branch so that git-pull(1) will appropriately merge from that +remote branch. If this behavior is desired, it is possible to make it +the default using the global branch.autosetupmerge configuration +flag. Otherwise, it can be chosen per-branch using the --track +and --no-track options.

With a -m or -M option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch @@ -520,7 +526,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 3ea3b8063..603f87f3b 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git-branch' [--color | --no-color] [-r | -a] [-v [--abbrev= | --no-abbrev]] -'git-branch' [-l] [-f] [] +'git-branch' [--track | --no-track] [-l] [-f] [] 'git-branch' (-m | -M) [] 'git-branch' (-d | -D) [-r] ... @@ -26,6 +26,13 @@ It will start out with a head equal to the one given as . If no is given, the branch will be created with a head equal to that of the currently checked out branch. +When a local branch is started off a remote branch, git can setup the +branch so that gitlink:git-pull[1] will appropriately merge from that +remote branch. If this behavior is desired, it is possible to make it +the default using the global `branch.autosetupmerge` configuration +flag. Otherwise, it can be chosen per-branch using the `--track` +and `--no-track` options. + With a '-m' or '-M' option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch diff --git a/git-checkout.html b/git-checkout.html index 843465cba..05a675a51 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -273,7 +273,7 @@ git-checkout(1) Manual Page

SYNOPSIS

git-checkout [-q] [-f] [-b <new_branch> [-l]] [-m] [<branch>] +

git-checkout [-q] [-f] [-b [--track | --no-track] <new_branch> [-l]] [-m] [<branch>] git-checkout [<tree-ish>] <paths>…

DESCRIPTION

@@ -282,7 +282,8 @@ git-checkout(1) Manual Page updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>. Using -b will cause <new_branch> to -be created.

+be created; in this case you can use the --track or --no-track +options, which will be passed to git branch.

When <paths> are given, this command does not switch branches. It updates the named paths in the working tree from the index file (i.e. it runs git-checkout-index -f -u), or a @@ -324,6 +325,26 @@ working tree.

+--track +

+ When -b is given and a branch is created off a remote branch, + setup so that git-pull will automatically retrieve data from + the remote branch. +

+--no-track +

+ When -b is given and a branch is created off a remote branch, + force that git-pull will automatically retrieve data from + the remote branch independent of the configuration settings. +

-l

@@ -511,7 +532,7 @@ $ git add frotz

diff --git a/git-checkout.txt b/git-checkout.txt index 1ae77be45..f5b2d5017 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch SYNOPSIS -------- [verse] -'git-checkout' [-q] [-f] [-b [-l]] [-m] [] +'git-checkout' [-q] [-f] [-b [--track | --no-track] [-l]] [-m] [] 'git-checkout' [] ... DESCRIPTION @@ -18,7 +18,8 @@ When are not given, this command switches branches by updating the index and working tree to reflect the specified branch, , and updating HEAD to be or, if specified, . Using -b will cause to -be created. +be created; in this case you can use the --track or --no-track +options, which will be passed to `git branch`. When are given, this command does *not* switch branches. It updates the named paths in the working tree from @@ -45,6 +46,16 @@ OPTIONS by gitlink:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name. +--track:: + When -b is given and a branch is created off a remote branch, + setup so that git-pull will automatically retrieve data from + the remote branch. + +--no-track:: + When -b is given and a branch is created off a remote branch, + force that git-pull will automatically retrieve data from + the remote branch independent of the configuration settings. + -l:: Create the new branch's ref log. This activates recording of all changes to made the branch ref, enabling use of date diff --git a/git-config.html b/git-config.html index 78161b6d3..0bf7285ac 100644 --- a/git-config.html +++ b/git-config.html @@ -1257,6 +1257,16 @@ merge.summary

+merge.tool +

+ Controls which merge resolution program is used by + git-mergetool(l). Valid values are: "kdiff3", "tkdiff", + "meld", "xxdiff", "emerge" +

merge.verbosity

@@ -1509,7 +1519,7 @@ transfer.unpackLimit diff --git a/git-cvsserver.html b/git-cvsserver.html index ad90a7c74..8059ac81d 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -406,10 +406,28 @@ so that calling cvs effectively calls git-cvsserver.

Clients known to work

CVS 1.12.9 on Debian +

+
+CVS 1.12.9 on Debian +
+
+
CVS 1.11.17 on MacOSX (from Fink package) +
+
+
Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes) -TortoiseCVS
+
+
+
+TortoiseCVS +
+

Operations supported

@@ -428,13 +446,24 @@ No keyword expansion or newline munging is supported.

Copyright and Authors

This program is copyright The Open University UK - 2006.

Authors: Martyn Smith <martyn@catalyst.net.nz> - Martin Langhoff <martin@catalyst.net.nz> - with ideas and patches from participants of the git-list <git@vger.kernel.org>.

Authors:

+
+Martyn Smith <martyn@catalyst.net.nz> +
+
+
+Martin Langhoff <martin@catalyst.net.nz> +
+

with ideas and patches from participants of the git-list <git@vger.kernel.org>.

Documentation

Documentation by Martyn Smith <martyn@catalyst.net.nz> and Martin Langhoff <martin@catalyst.net.nz> Matthias Urlichs <smurf@smurf.noris.de>.

Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@catalyst.net.nz>, and Matthias Urlichs <smurf@smurf.noris.de>.

GIT

@@ -442,7 +471,7 @@ No keyword expansion or newline munging is supported.

diff --git a/git-cvsserver.txt b/git-cvsserver.txt index e328db379..1c6f6a7e2 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -121,10 +121,10 @@ so that calling 'cvs' effectively calls git-cvsserver. Clients known to work --------------------- -CVS 1.12.9 on Debian -CVS 1.11.17 on MacOSX (from Fink package) -Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes) -TortoiseCVS +- CVS 1.12.9 on Debian +- CVS 1.11.17 on MacOSX (from Fink package) +- Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes) +- TortoiseCVS Operations supported -------------------- @@ -148,13 +148,16 @@ Copyright and Authors This program is copyright The Open University UK - 2006. -Authors: Martyn Smith - Martin Langhoff - with ideas and patches from participants of the git-list . +Authors: + +- Martyn Smith +- Martin Langhoff + +with ideas and patches from participants of the git-list . Documentation -------------- -Documentation by Martyn Smith and Martin Langhoff Matthias Urlichs . +Documentation by Martyn Smith , Martin Langhoff , and Matthias Urlichs . GIT --- diff --git a/git-mergetool.html b/git-mergetool.html new file mode 100644 index 000000000..a27739749 --- /dev/null +++ b/git-mergetool.html @@ -0,0 +1,326 @@ + + + + + + +git-mergetool(1) + + + +

SYNOPSIS

git-mergetool [--tool=<tool>] [<file>]…

DESCRIPTION

Use git mergetool to run one of several merge utilities to resolve +merge conflicts. It is typically run after git-merge(1).

If one or more <file> parameters are given, the merge tool program will +be run to resolve differences on each file. If no <file> names are +specified, git mergetool will run the merge tool program on every file +with merge conflicts.

OPTIONS

+-t or --tool=<tool> +

+ Use the merge resolution program specified by <tool>. + Valid merge tools are: + kdiff3, tkdiff, meld, xxdiff, and emerge. +

If a merge resolution program is not specified, 'git mergetool'
+will use the configuration variable merge.tool.  If the
+configuration variable merge.tool is not set, 'git mergetool'
+will pick a suitable default.

Author

Written by Theodore Y Ts'o <tytso@mit.edu>

Documentation

Documentation by Theodore Y Ts'o.

GIT

Part of the git(7) suite

+ + + diff --git a/git-mergetool.txt b/git-mergetool.txt new file mode 100644 index 000000000..ae69a0eb8 --- /dev/null +++ b/git-mergetool.txt @@ -0,0 +1,46 @@ +git-mergetool(1) +================ + +NAME +---- +git-mergetool - Run merge conflict resolution tools to resolve merge conflicts + +SYNOPSIS +-------- +'git-mergetool' [--tool=] []... + +DESCRIPTION +----------- + +Use 'git mergetool' to run one of several merge utilities to resolve +merge conflicts. It is typically run after gitlink:git-merge[1]. + +If one or more parameters are given, the merge tool program will +be run to resolve differences on each file. If no names are +specified, 'git mergetool' will run the merge tool program on every file +with merge conflicts. + +OPTIONS +------- +-t or --tool=:: + Use the merge resolution program specified by . + Valid merge tools are: + kdiff3, tkdiff, meld, xxdiff, and emerge. + + If a merge resolution program is not specified, 'git mergetool' + will use the configuration variable merge.tool. If the + configuration variable merge.tool is not set, 'git mergetool' + will pick a suitable default. + +Author +------ +Written by Theodore Y Ts'o + +Documentation +-------------- +Documentation by Theodore Y Ts'o. + +GIT +--- +Part of the gitlink:git[7] suite + diff --git a/git-svn.html b/git-svn.html index ba80e48ad..b3f30295e 100644 --- a/git-svn.html +++ b/git-svn.html @@ -431,7 +431,25 @@ accepts. 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.

+ +

+-l +
+--local +: +
+ Do not fetch remotely; only run git-rebase against the + last fetched commit from the upstream SVN. +
+

dcommit
+git-mergetool(1) +: +
+ Run merge conflict resolution tools to resolve merge conflicts. +
+
git-pack-refs(1): @@ -2309,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.

-Last updated 12-Mar-2007 07:28:56 UTC +Last updated 14-Mar-2007 11:19:14 UTC

-- 2.26.2

SYNOPSIS

DESCRIPTION

Clients known to work

Operations supported

Copyright and Authors

Documentation

GIT

+git-mergetool(1) Manual Page +

NAME

SYNOPSIS

DESCRIPTION

OPTIONS

Author

Documentation

GIT