.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BRANCH" "1" "03/03/2007" "" ""
+.TH "GIT\-BRANCH" "1" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.nf
\fIgit\-branch\fR [\-\-color | \-\-no\-color] [\-r | \-a]
[\-v [\-\-abbrev=<length> | \-\-no\-abbrev]]
-\fIgit\-branch\fR [\-l] [\-f] <branchname> [<start\-point>]
+\fIgit\-branch\fR [\-\-track | \-\-no\-track] [\-l] [\-f] <branchname> [<start\-point>]
\fIgit\-branch\fR (\-m | \-M) [<oldbranch>] <newbranch>
\fIgit\-branch\fR (\-d | \-D) [\-r] <branchname>\&...
.fi
In its second form, a new branch named <branchname> will be created. 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 \fBgit\-pull\fR(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 \fI\-m\fR or \fI\-M\fR 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 renaming. If <newbranch> exists, \-M must be used to force the rename to happen.
With a \-d or \-D option, <branchname> will be deleted. You may specify more than one branch for deletion. If the branch currently has a ref log then the ref log will also be deleted. Use \-r together with \-d to delete remote\-tracking branches.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECKOUT" "1" "02/18/2007" "" ""
+.TH "GIT\-CHECKOUT" "1" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
.sp
.nf
-\fIgit\-checkout\fR [\-q] [\-f] [\-b <new_branch> [\-l]] [\-m] [<branch>]
+\fIgit\-checkout\fR [\-q] [\-f] [\-b [\-\-track | \-\-no\-track] <new_branch> [\-l]] [\-m] [<branch>]
\fIgit\-checkout\fR [<tree\-ish>] <paths>\&...
.fi
.SH "DESCRIPTION"
-When <paths> are not given, this command switches branches by 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.
+When <paths> are not given, this command switches branches by 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; 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 \fBnot\fR 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 named commit. In this case, \-f and \-b options are meaningless and giving either of them results in an error. <tree\-ish> argument can be used to specify a specific tree\-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree.
.SH "OPTIONS"
\-b
Create a new branch named <new_branch> and start it at <branch>. The new branch name must pass all checks defined by \fBgit\-check\-ref\-format\fR(1). Some of these checks may restrict the characters allowed in a branch name.
.TP
+\-\-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.
+.TP
+\-\-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.
+.TP
\-l
Create the new branch's ref log. This activates recording of all changes to made the branch ref, enabling use of date
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONFIG" "1" "03/09/2007" "" ""
+.TH "GIT\-CONFIG" "1" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
merge.summary
Whether to include summaries of merged commits in newly created merge commit messages. False by default.
.TP
+merge.tool
+Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge"
+.TP
merge.verbosity
Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2.
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CVSSERVER" "1" "10/03/2006" "" ""
+.TH "GIT\-CVSSERVER" "1" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.fi
.SH "DESCRIPTION"
This application is a CVS emulation layer for git.
-.sp
+
It is highly functional. However, not all methods are implemented, and for those methods that are implemented, not all switches are implemented.
-.sp
+
Testing has been done using both the CLI CVS client, and the Eclipse CVS plugin. Most functionality works fine with both of these clients.
-.sp
.SH "LIMITATIONS"
Currently cvsserver works over SSH connections for read/write clients, and over pserver for anonymous CVS access.
-.sp
+
CVS clients cannot tag, branch or perform GIT merges.
-.sp
.SH "INSTALLATION"
.TP 3
1.
.nf
cvspserver stream tcp nowait nobody git\-cvsserver pserver
.fi
-Note: In some cases, you need to pass the
-\fIpserver\fR
-argument twice for git\-cvsserver to see it. So the line would look like
+Note: In some cases, you need to pass the \fIpserver\fR argument twice for git\-cvsserver to see it. So the line would look like
.sp
.nf
cvspserver stream tcp nowait nobody git\-cvsserver pserver pserver
.TP
3.
On the client machine you need to set the following variables. CVSROOT should be set as per normal, but the directory should point at the appropriate git repo. For example:
-.sp
+
For SSH access, CVS_SERVER should be set to git\-cvsserver
-.sp
+
Example:
.sp
.nf
For SSH clients that will make commits, make sure their .bashrc file sets the GIT_AUTHOR and GIT_COMMITTER variables.
.TP
5.
-Clients should now be able to check out the project. Use the CVS
-\fImodule\fR
-name to indicate what GIT
-\fIhead\fR
-you want to check out. Example:
+Clients should now be able to check out the project. Use the CVS \fImodule\fR name to indicate what GIT \fIhead\fR you want to check out. Example:
.sp
.nf
cvs co \-d project\-master master
.fi
.SH "ECLIPSE CVS CLIENT NOTES"
To get a checkout with the Eclipse CVS client:
-.sp
.TP 3
1.
Select "Create a new project \-> From CVS checkout"
Create a new location. See the notes below for details on how to choose the right protocol.
.TP
3.
-Browse the
-\fImodules\fR
-available. It will give you a list of the heads in the repository. You will not be able to browse the tree from there. Only the heads.
+Browse the \fImodules\fR available. It will give you a list of the heads in the repository. You will not be able to browse the tree from there. Only the heads.
.TP
4.
-Pick
-\fIHEAD\fR
-when it asks what branch/tag to check out. Untick the "launch commit wizard" to avoid committing the .project file.
+Pick \fIHEAD\fR when it asks what branch/tag to check out. Untick the "launch commit wizard" to avoid committing the .project file.
+
Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the \fIext\fR protocol, and configure \fIext\fR access on the Preferences\->Team\->CVS\->ExtConnection pane. Set CVS_SERVER to \fIgit\-cvsserver\fR. Not that password support is not good when using \fIext\fR, you will definitely want to have SSH keys setup.
-.sp
+
Alternatively, you can just use the non\-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace the cvs utility on the server with git\-cvsserver or manipulate your .bashrc so that calling \fIcvs\fR effectively calls git\-cvsserver.
-.sp
.SH "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
-.sp
+.TP 3
+\(bu
+CVS 1.12.9 on Debian
+.TP
+\(bu
+CVS 1.11.17 on MacOSX (from Fink package)
+.TP
+\(bu
+Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)
+.TP
+\(bu
+TortoiseCVS
.SH "OPERATIONS SUPPORTED"
All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit. Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage.
-.sp
+
The server will set the \-k mode to binary when relevant. In proper GIT tradition, the contents of the files are always respected. No keyword expansion or newline munging is supported.
-.sp
.SH "DEPENDENCIES"
git\-cvsserver depends on DBD::SQLite.
-.sp
.SH "COPYRIGHT AND AUTHORS"
This program is copyright The Open University UK \- 2006.
-.sp
-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>.
-.sp
+
+Authors:
+.TP 3
+\(bu
+Martyn Smith <martyn@catalyst.net.nz>
+.TP
+\(bu
+Martin Langhoff <martin@catalyst.net.nz>
+
+with ideas and patches from participants of the git\-list <git@vger.kernel.org>.
.SH "DOCUMENTATION"
-Documentation by Martyn Smith <martyn@catalyst.net.nz> and Martin Langhoff <martin@catalyst.net.nz> Matthias Urlichs <smurf@smurf.noris.de>.
-.sp
+Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@catalyst.net.nz>, and Matthias Urlichs <smurf@smurf.noris.de>.
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
--- /dev/null
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "GIT\-MERGETOOL" "1" "03/14/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+git\-mergetool \- Run merge conflict resolution tools to resolve merge conflicts
+.SH "SYNOPSIS"
+\fIgit\-mergetool\fR [\-\-tool=<tool>] [<file>]\&...
+.SH "DESCRIPTION"
+Use \fIgit mergetool\fR to run one of several merge utilities to resolve merge conflicts. It is typically run after \fBgit\-merge\fR(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, \fIgit mergetool\fR will run the merge tool program on every file with merge conflicts.
+.SH "OPTIONS"
+.TP
+\-t or \-\-tool=<tool>
+Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, and emerge.
+.sp
+.nf
+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.
+.fi
+.SH "AUTHOR"
+Written by Theodore Y Ts'o <tytso@mit.edu>
+.SH "DOCUMENTATION"
+Documentation by Theodore Y Ts'o.
+.SH "GIT"
+Part of the \fBgit\fR(7) suite
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SVN" "1" "03/02/2007" "" ""
+.TH "GIT\-SVN" "1" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
This accepts all options that \fIgit\-svn fetch\fR and \fIgit\-rebase\fR accepts. However \fI\-\-fetch\-all\fR only fetches from the current [svn\-remote], and not all [svn\-remote] definitions.
Like \fIgit\-rebase\fR; this requires that the working tree be clean and have no uncommitted changes.
+
++
+.TP
+\-l , \-\-local
+Do not fetch remotely; only run \fIgit\-rebase\fR against the last fetched commit from the upstream SVN.
+
++
.TP
\fIdcommit\fR
Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in git. It is recommended that you run git\-svn fetch and rebase (not pull or merge) your commits 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 \fIset\-tree\fR (below) because it produces cleaner, more linear history.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT" "7" "03/12/2007" "" ""
+.TH "GIT" "7" "03/14/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\fBgit\-lost\-found\fR(1)
Recover lost refs that luckily have not yet been pruned.
.TP
+\fBgit\-mergetool\fR(1)
+Run merge conflict resolution tools to resolve merge conflicts.
+.TP
\fBgit\-pack\-refs\fR(1)
Pack heads and tags for efficient repository access.
.TP
projects / git.git / commitdiff