diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:42 -0700 |
| commit | 16007f3916b885d29de6c48832aa6a4213ab7588 (patch) | |
| tree | a32a16393cb312398d8c96e61daef15cb708b7f2 /Documentation | |
| parent | read-tree() and unpack_trees(): use consistent limit (diff) | |
| parent | Merge branch 'ph/maint-quiltimport' into maint (diff) | |
| download | tgif-16007f3916b885d29de6c48832aa6a4213ab7588.tar.xz | |
Merge branch 'maint'
* maint:
merge-file: handle empty files gracefully
merge-recursive: handle file mode changes
Minor wording changes in the keyboard descriptions in git-add --interactive.
git fetch: Take '-n' to mean '--no-tags'
quiltimport: fix misquoting of parsed -p<num> parameter
git-quiltimport: better parser to grok "enhanced" series files.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 47799097ce..c751a17d07 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -207,16 +207,14 @@ patch:: and the working tree file and asks you if you want to stage the change of each hunk. You can say: - y - add the change from that hunk to index - n - do not add the change from that hunk to index - a - add the change from that hunk and all the rest to index - d - do not the change from that hunk nor any of the rest to index - j - do not decide on this hunk now, and view the next - undecided hunk - J - do not decide on this hunk now, and view the next hunk - k - do not decide on this hunk now, and view the previous - undecided hunk - K - do not decide on this hunk now, and view the previous hunk + y - stage this hunk + n - do not stage this hunk + a - stage this and all the remaining hunks in the file + d - do not stage this hunk nor any of the remaining hunks in the file + j - leave this hunk undecided, see next undecided hunk + J - leave this hunk undecided, see next hunk + k - leave this hunk undecided, see previous undecided hunk + K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks ? - print help + |