From 17bbacaef1ea96c94dc89492fadf5e6b5c9a65b5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Dec 2006 11:36:31 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.3-gd4ada --- git-add.html | 145 +++++++++++++++++++++++++++++++++++++++++++++- git-add.txt | 119 ++++++++++++++++++++++++++++++++++++- git-rev-list.html | 11 +++- git-rev-list.txt | 5 ++ 4 files changed, 276 insertions(+), 4 deletions(-) diff --git a/git-add.html b/git-add.html index b43876537..f7e641f61 100644 --- a/git-add.html +++ b/git-add.html @@ -272,7 +272,7 @@ git-add(1) Manual Page

SYNOPSIS

-

git-add [-n] [-v] [--] <file>…

+

git-add [-n] [-v] [--interactive] [--] <file>…

DESCRIPTION

@@ -320,6 +320,15 @@ commit.

+--interactive +
+
+

+ Add modified contents in the working tree interactively to + the index. +

+
+
--
@@ -359,6 +368,138 @@ git-add git-*.sh
+

Interactive mode

+
+

When the command enters the interactive mode, it shows the +output of the status subcommand, and then goes into ints +interactive command loop.

+

The command loop shows the list of subcommands available, and +gives a prompt "What now> ". In general, when the prompt ends +with a single >, you can pick only one of the choices given +and type return, like this:

+
+
+
    *** Commands ***
+      1: status       2: update       3: revert       4: add untracked
+      5: patch        6: diff         7: quit         8: help
+    What now> 1
+
+

You also could say "s" or "sta" or "status" above as long as the +choice is unique.

+

The main command loop has 6 subcommands (plus help and quit).

+
+
+status +
+
+

+ This shows the change between HEAD and index (i.e. what will be + committed if you say "git commit"), and between index and + working tree files (i.e. what you could stage further before + "git commit" using "git-add") for each path. A sample output + looks like this: +

+
+
+
              staged     unstaged path
+     1:       binary      nothing foo.png
+     2:     +403/-35        +1/-1 git-add--interactive.perl
+
+

It shows that foo.png has differences from HEAD (but that is +binary so line count cannot be shown) and there is no +difference between indexed copy and the working tree +version (if the working tree version were also different, +binary would have been shown in place of nothing). The +other file, git-add--interactive.perl, has 403 lines added +and 35 lines deleted if you commit what is in the index, but +working tree file has further modifications (one addition and +one deletion).

+
+
+update +
+
+

+ This shows the status information and gives prompt + "Update>>". When the prompt ends with double >>, you can + make more than one selection, concatenated with whitespace or + comma. Also you can say ranges. E.g. "2-5 7,9" to choose + 2,3,4,5,7,9 from the list. You can say * to choose + everything. +

+

What you chose are then highlighted with *, +like this:

+
+
+
           staged     unstaged path
+  1:       binary      nothing foo.png
+* 2:     +403/-35        +1/-1 git-add--interactive.perl
+
+

To remove selection, prefix the input with - +like this:

+
+
+
Update>> -2
+
+

After making the selection, answer with an empty line to stage the +contents of working tree files for selected paths in the index.

+
+
+revert +
+
+

+ This has a very similar UI to update, and the staged + information for selected paths are reverted to that of the + HEAD version. Reverting new paths makes them untracked. +

+
+
+add untracked +
+
+

+ This has a very similar UI to update and + revert, and lets you add untracked paths to the index. +

+
+
+patch +
+
+

+ This lets you choose one path out of status like selection. + After choosing the path, it presents 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: +

+
+
+
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
+
+

After deciding the fate for all hunks, if there is any hunk +that was chosen, the index is updated with the selected hunks.

+
+
+diff +
+
+

+ This lets you review what will be committed (i.e. between + HEAD and index). +

+
+
+

See Also

git-status(1) @@ -381,7 +522,7 @@ git-add git-*.sh

diff --git a/git-add.txt b/git-add.txt index d86c0e7f1..8710b3a75 100644 --- a/git-add.txt +++ b/git-add.txt @@ -7,7 +7,7 @@ git-add - Add file contents to the changeset to be committed next SYNOPSIS -------- -'git-add' [-n] [-v] [--] ... +'git-add' [-n] [-v] [--interactive] [--] ... DESCRIPTION ----------- @@ -43,6 +43,10 @@ OPTIONS -v:: Be verbose. +\--interactive:: + Add modified contents in the working tree interactively to + the index. + \--:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken @@ -67,6 +71,119 @@ git-add git-*.sh:: (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`. +Interactive mode +---------------- +When the command enters the interactive mode, it shows the +output of the 'status' subcommand, and then goes into ints +interactive command loop. + +The command loop shows the list of subcommands available, and +gives a prompt "What now> ". In general, when the prompt ends +with a single '>', you can pick only one of the choices given +and type return, like this: + +------------ + *** Commands *** + 1: status 2: update 3: revert 4: add untracked + 5: patch 6: diff 7: quit 8: help + What now> 1 +------------ + +You also could say "s" or "sta" or "status" above as long as the +choice is unique. + +The main command loop has 6 subcommands (plus help and quit). + +status:: + + This shows the change between HEAD and index (i.e. what will be + committed if you say "git commit"), and between index and + working tree files (i.e. what you could stage further before + "git commit" using "git-add") for each path. A sample output + looks like this: ++ +------------ + staged unstaged path + 1: binary nothing foo.png + 2: +403/-35 +1/-1 git-add--interactive.perl +------------ ++ +It shows that foo.png has differences from HEAD (but that is +binary so line count cannot be shown) and there is no +difference between indexed copy and the working tree +version (if the working tree version were also different, +'binary' would have been shown in place of 'nothing'). The +other file, git-add--interactive.perl, has 403 lines added +and 35 lines deleted if you commit what is in the index, but +working tree file has further modifications (one addition and +one deletion). + +update:: + + This shows the status information and gives prompt + "Update>>". When the prompt ends with double '>>', you can + make more than one selection, concatenated with whitespace or + comma. Also you can say ranges. E.g. "2-5 7,9" to choose + 2,3,4,5,7,9 from the list. You can say '*' to choose + everything. ++ +What you chose are then highlighted with '*', +like this: ++ +------------ + staged unstaged path + 1: binary nothing foo.png +* 2: +403/-35 +1/-1 git-add--interactive.perl +------------ ++ +To remove selection, prefix the input with `-` +like this: ++ +------------ +Update>> -2 +------------ ++ +After making the selection, answer with an empty line to stage the +contents of working tree files for selected paths in the index. + +revert:: + + This has a very similar UI to 'update', and the staged + information for selected paths are reverted to that of the + HEAD version. Reverting new paths makes them untracked. + +add untracked:: + + This has a very similar UI to 'update' and + 'revert', and lets you add untracked paths to the index. + +patch:: + + This lets you choose one path out of 'status' like selection. + After choosing the path, it presents 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: + + 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 ++ +After deciding the fate for all hunks, if there is any hunk +that was chosen, the index is updated with the selected hunks. + +diff:: + + This lets you review what will be committed (i.e. between + HEAD and index). + + See Also -------- gitlink:git-status[1] diff --git a/git-rev-list.html b/git-rev-list.html index b10c371f2..41ccd2cde 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -274,6 +274,7 @@ git-rev-list(1) Manual Page
git-rev-list [ --max-count=number ] + [ --skip=number ] [ --max-age=timestamp ] [ --min-age=timestamp ] [ --sparse ] @@ -551,6 +552,14 @@ limiting may be applied.

+--skip=number +
+
+

+ Skip number commits before starting to show the commit output. +

+
+
--since=date, --after=date
@@ -765,7 +774,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index ec43c0b3a..9e0dcf8d3 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -10,6 +10,7 @@ SYNOPSIS -------- [verse] 'git-rev-list' [ \--max-count=number ] + [ \--skip=number ] [ \--max-age=timestamp ] [ \--min-age=timestamp ] [ \--sparse ] @@ -139,6 +140,10 @@ limiting may be applied. Limit the number of commits output. +--skip='number':: + + Skip 'number' commits before starting to show the commit output. + --since='date', --after='date':: Show commits more recent than a specific date. -- 2.26.2