diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:40:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:40:14 -0700 |
| commit | fe4ce3a72140d32d82aec860c8eb319a78205de6 (patch) | |
| tree | ebb13577e862757b3a7fec059403effbf61898ab /Documentation | |
| parent | 84047e0f2847351ac84bd263a727c0e2d5002b2d (diff) | |
| parent | cafa56702bc3742a99c39d3b4d1770178720bcc4 (diff) | |
| download | git-fe4ce3a72140d32d82aec860c8eb319a78205de6.tar.gz git-fe4ce3a72140d32d82aec860c8eb319a78205de6.tar.xz | |
Merge branch 'mm/maint-add-p-quit' into maint
* mm/maint-add-p-quit:
Update git-add.txt according to the new possibilities of 'git add -p'.
add-interactive: refactor mode hunk handling
git add -p: new "quit" command at the prompt.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index ce71838b9..d938b4228 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -245,8 +245,11 @@ patch:: y - stage this hunk n - do not stage this hunk + q - quit, do not stage this hunk nor any of the remaining ones 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 + g - select a hunk to go to + / - search for a hunk matching the given regex 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 |