diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:14:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:14:59 -0700 |
commit | 69b060c84e25c2cb90b16bd0ba602bc14102e1ae (patch) | |
tree | b865f4f5d9f3e42ddd3c0a49228c2f57b326b4ec /Documentation | |
parent | apply: fix copy/rename breakage (diff) | |
parent | git-add--interactive: manual hunk editing mode (diff) | |
download | tgif-69b060c84e25c2cb90b16bd0ba602bc14102e1ae.tar.xz |
Merge branch 'tr/add-i-e'
* tr/add-i-e:
git-add--interactive: manual hunk editing mode
git-add--interactive: remove hunk coalescing
git-add--interactive: replace hunk recounting with apply --recount
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-add.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 011a743652..46dd56c12a 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -236,6 +236,7 @@ patch:: 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 + e - manually edit the current hunk ? - print help + After deciding the fate for all hunks, if there is any hunk |