pull --rebase: exit early when the working directory is dirty

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 8dbfb0d5a3ef015367e990f7c24d2a47b176fde4..50d12da89fca37b60a024aeb2ac6de9cb2daf001 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -22,7 +22,7 @@ git repository.
 OPTIONS
 -------
 To control which revisions to shown, the command takes options applicable to
-the gitlink:git-rev-list[1] command. This manual page describes only the most
+the linkgit:git-rev-list[1] command. This manual page describes only the most
 frequently used options.
 
 -n <number>, --max-count=<number>::
@@ -41,6 +41,12 @@ frequently used options.
 
        Show all branches.
 
+--merge::
+
+       After an attempt to merge stops with conflicts, show the commits on
+       the history between two branches (i.e. the HEAD and the MERGE_HEAD)
+       that modify the conflicted files.
+
 <revs>::
 
        Limit the revisions to show. This can be either a single revision
@@ -48,7 +54,7 @@ frequently used options.
        the form "'<from>'..'<to>'" to show all revisions between '<from>' and
        back to '<to>'. Note, more advanced revision selection can be applied.
        For a more complete list of ways to spell object names, see
-       "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+       "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 <path>::
 
@@ -74,6 +80,11 @@ gitk --max-count=100 --all \-- Makefile::
        Show at most 100 changes made to the file 'Makefile'. Instead of only
        looking for changes in the current branch look in all branches.
 
+Files
+-----
+Gitk creates the .gitk file in your $HOME directory to store preferences
+such as display options, font, and colors.
+
 See Also
 --------
 'qgit(1)'::
@@ -98,4 +109,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite