aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-gui.txt
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2008-11-13 20:28:49 +0300
committerJunio C Hamano <gitster@pobox.com>2008-11-14 21:38:11 -0800
commita2df1fb2e52a49bf6b17b352581510efd851f337 (patch)
tree9413cf9fb055824f425ae5d9769b667ae305ace4 /Documentation/git-gui.txt
parente1ca0defd2039aecd7b5a68ed653f8ec40cf509e (diff)
downloadgit-a2df1fb2e52a49bf6b17b352581510efd851f337.tar.gz
git-a2df1fb2e52a49bf6b17b352581510efd851f337.tar.xz
Documentation: New GUI configuration and command-line options.
Add information on new git-gui and gitk command-line options, configuration variables, and the encoding attribute. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-gui.txt')
-rw-r--r--Documentation/git-gui.txt19
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index 0e650f497..d0bc98b85 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -65,9 +65,28 @@ git gui blame v0.99.8 Makefile::
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 linkgit:git-mergetool[1]
git citool::