summaryrefslogtreecommitdiff
path: root/Documentation/git-add.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-11 18:38:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-11 18:38:06 (GMT)
commit0c529e44d3ddd5c947ed33eace8ec6818e47afcb (patch)
treea53a2e06449cedb556624278f37adfa58acf16fa /Documentation/git-add.txt
parentf3b173daf400813c7f587a011290dac31de2b68e (diff)
parent6086ff65dfcf48237bdac6c64a85bef5d34d5b4e (diff)
downloadgit-0c529e44d3ddd5c947ed33eace8ec6818e47afcb.zip
git-0c529e44d3ddd5c947ed33eace8ec6818e47afcb.tar.gz
git-0c529e44d3ddd5c947ed33eace8ec6818e47afcb.tar.bz2
Merge branch 'vh/config-interactive-singlekey-doc'
* vh/config-interactive-singlekey-doc: git-reset.txt: better docs for '--patch' git-checkout.txt: better docs for '--patch' git-stash.txt: better docs for '--patch' git-add.txt: document 'interactive.singlekey' config.txt: 'interactive.singlekey; is used by...
Diffstat (limited to 'Documentation/git-add.txt')
-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 35cb5d3..9c1d395 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -274,7 +274,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
@@ -293,6 +294,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::