git-gui(1) [suse man page]

GIT-GUI(1)							    Git Manual								GIT-GUI(1)

NAME

       git-gui - A portable graphical interface to Git

SYNOPSIS

       git gui [<command>] [arguments]

DESCRIPTION

       A Tcl/Tk based graphical user interface to Git. git gui focuses on allowing users to make changes to their repository by making new
       commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories.

       Unlike gitk, git gui focuses on commit generation and single file annotation and does not show project history. It does however supply menu
       actions to start a gitk session from within git gui.

       git gui is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible OS
       specific user interface guidelines are followed, making git gui a fairly native interface for users.

COMMANDS

       blame
	   Start a blame viewer on the specified file on the given version (or working directory if not specified).

       browser
	   Start a tree browser showing all files in the specified commit (or HEAD by default). Files selected through the browser are opened in
	   the blame viewer.

       citool
	   Start git gui and arrange to make exactly one commit before exiting and returning to the shell. The interface is limited to only commit
	   actions, slightly reducing the application's startup time and simplifying the menubar.

       version
	   Display the currently running version of git gui.

EXAMPLES

       git gui blame Makefile
	   Show the contents of the file Makefile in the current working directory, and provide annotations for both the original author of each
	   line, and who moved the line to its current location. The uncommitted file is annotated, and uncommitted changes (if any) are
	   explicitly attributed to Not Yet Committed.

       git gui blame v0.99.8 Makefile
	   Show the contents of Makefile in revision v0.99.8 and provide annotations for each line. Unlike the above example the file is read from
	   the object database and not the working directory.

       git gui blame --line=100 Makefile
	   Loads annotations as described above and automatically scrolls the view to center on line 100.

       git gui citool
	   Make one commit and return to the shell when it is complete. This command returns a non-zero exit code if the window was closed in any
	   way other than by making a commit.

       git gui citool --amend
	   Automatically enter the Amend Last Commit mode of the interface.

       git gui citool --nocommit
	   Behave as normal citool, but instead of making a commit simply terminate with a zero exit code. It still checks that the index does not
	   contain any unmerged entries, so you can use it as a GUI version of git-mergetool(1)

       git citool
	   Same as git gui citool (above).

       git gui browser maint
	   Show a browser for the tree of the maint branch. Files selected in the browser can be viewed with the internal blame viewer.

SEE ALSO

       gitk(1)
	   The git repository browser. Shows branches, commit history and file differences. gitk is the utility started by git gui's Repository
	   Visualize actions.

OTHER

       git gui is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience
       of end users.

       A git gui development repository can be obtained from:

	   git clone git://repo.or.cz/git-gui.git

       or

	   git clone http://repo.or.cz/r/git-gui.git

       or browsed online at http://repo.or.cz/w/git-gui.git/.

AUTHOR

       Written by Shawn O. Pearce <spearce@spearce.org[1]>.

DOCUMENTATION

       Documentation by Shawn O. Pearce <spearce@spearce.org[1]>.

GIT

       Part of the git(1) suite

NOTES

	1. spearce@spearce.org
	   mailto:spearce@spearce.org

Git 1.7.1							    07/05/2010								GIT-GUI(1)

Check Out this Related Man Page

GIT-DIFFTOOL(1) 						    Git Manual							   GIT-DIFFTOOL(1)

NAME

       git-difftool - Show changes using common diff tools

SYNOPSIS

       git difftool [<options>] <commit>{0,2} [--] [<path>...]

DESCRIPTION

       git difftool is a git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a
       frontend to git diff and accepts the same options and arguments.

OPTIONS

       -y, --no-prompt
	   Do not prompt before launching a diff tool.

       --prompt
	   Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration
	   settings.

       -t <tool>, --tool=<tool>
	   Use the diff tool specified by <tool>. Valid merge tools are: kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
	   ecmerge, diffuse, opendiff, p4merge and araxis.

	   If a diff tool is not specified, git difftool will use the configuration variable diff.tool. If the configuration variable diff.tool is
	   not set, git difftool will pick a suitable default.

	   You can explicitly provide a full path to the tool by setting the configuration variable difftool.<tool>.path. For example, you can
	   configure the absolute path to kdiff3 by setting difftool.kdiff3.path. Otherwise, git difftool assumes the tool is available in PATH.

	   Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command
	   line to invoke in a configuration variable difftool.<tool>.cmd.

	   When git difftool is invoked with this tool (either through the -t or --tool option or the diff.tool configuration variable) the
	   configured command line will be invoked with the following variables available: $LOCAL is set to the name of the temporary file
	   containing the contents of the diff pre-image and $REMOTE is set to the name of the temporary file containing the contents of the diff
	   post-image.	$BASE is provided for compatibility with custom merge tool commands and has the same value as $LOCAL.

       -x <command>, --extcmd=<command>
	   Specify a custom command for viewing diffs.	git-difftool ignores the configured defaults and runs $command $LOCAL $REMOTE when this
	   option is specified.

       -g, --gui
	   When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.guitool variable
	   instead of diff.tool.

       See git-diff(1) for the full list of supported options.

CONFIG VARIABLES

       git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined.

       diff.tool
	   The default diff tool to use.

       diff.guitool
	   The default diff tool to use when --gui is specified.

       difftool.<tool>.path
	   Override the path for the given tool. This is useful in case your tool is not in the PATH.

       difftool.<tool>.cmd
	   Specify the command to invoke the specified diff tool.

	   See the --tool=<tool> option above for more details.

       difftool.prompt
	   Prompt before each invocation of the diff tool.

SEE ALSO

       git-diff(1)
	   Show changes between commits, commit and working tree, etc

       git-mergetool(1)
	   Run merge conflict resolution tools to resolve merge conflicts

       git-config(1)
	   Get and set repository or global options

AUTHOR

       Written by David Aguilar <davvid@gmail.com[1]>.

DOCUMENTATION

       Documentation by David Aguilar and the git-list <git@vger.kernel.org[2]>.

GIT

       Part of the git(1) suite

NOTES

	1. davvid@gmail.com
	   mailto:davvid@gmail.com

	2. git@vger.kernel.org
	   mailto:git@vger.kernel.org

Git 1.7.1							    07/05/2010							   GIT-DIFFTOOL(1)

Linux and UNIX Man Pages

git-gui(1) [suse man page]

Check Out this Related Man Page