aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Haenel <valentin.haenel@gmx.de>2011-05-05 20:48:45 +0200
committerJunio C Hamano <gitster@pobox.com>2011-05-05 12:43:11 -0700
commitc105356ed4636167b96526cd41e2cbaca051432c (patch)
treea70b12fe386f6b6d1acaed829d67ebb4b6fa45c3
parent31be5d87a2aa2c40f021f37d9a5408e59804fd7f (diff)
downloadgit-c105356ed4636167b96526cd41e2cbaca051432c.tar.gz
git-c105356ed4636167b96526cd41e2cbaca051432c.tar.xz
git-add.txt: document 'interactive.singlekey'
This is documented in the section about the 'Interactive Mode', rather than for the option '--patch', since this is the section is where people go to learn about '--patch'. Helped-by: Jeff King <peff@peff.net> Mentored-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-add.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 7eebbefe7..f072b5964 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -272,7 +272,8 @@ patch::
This lets you choose one path out of a 'status' like selection.
After choosing the path, it presents the diff between the index
and the working tree file and asks you if you want to stage
- the change of each hunk. You can say:
+ the change of each hunk. You can select one of the following
+ options and type return:
y - stage this hunk
n - do not stage this hunk
@@ -291,6 +292,9 @@ patch::
+
After deciding the fate for all hunks, if there is any hunk
that was chosen, the index is updated with the selected hunks.
++
+You can omit having to type return here, by setting the configuration
+variable `interactive.singlekey` to `true`.
diff::