From 00e884a91e0f543a4157ce3c125e5957142bc099 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 15 Jun 2008 05:10:38 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.6-rc3 --- RelNotes-1.5.6.txt | 2 +- git-add.html | 13 ++++++++++--- git-add.txt | 7 +++++-- git-bisect.html | 9 ++++----- git-bisect.txt | 7 +++---- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/RelNotes-1.5.6.txt b/RelNotes-1.5.6.txt index ac4881e19..0d2608c88 100644 --- a/RelNotes-1.5.6.txt +++ b/RelNotes-1.5.6.txt @@ -111,6 +111,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.6-rc1 +O=v1.5.6-rc3 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-add.html b/git-add.html index 6b7be87af..0e7b67808 100644 --- a/git-add.html +++ b/git-add.html @@ -273,8 +273,9 @@ git-add(1) Manual Page

SYNOPSIS

-
git-add [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh] - [--ignore-errors] [--] <filepattern>…
+
git-add [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] + [--update | -u] [--refresh] [--ignore-errors] [--] + <filepattern>…

DESCRIPTION

@@ -340,6 +341,9 @@ commit.

-f
+
+--force +

Allow adding otherwise ignored files. @@ -375,6 +379,9 @@ commit.

-u
+
+--update +

Update only files that git already knows about, staging modified @@ -616,7 +623,7 @@ double-quote and control characters will still have problems.

diff --git a/git-add.txt b/git-add.txt index 9c6b081e6..b8e3fa675 100644 --- a/git-add.txt +++ b/git-add.txt @@ -8,8 +8,9 @@ git-add - Add file contents to the index SYNOPSIS -------- [verse] -'git-add' [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh] - [--ignore-errors] [--] ... +'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] + [--update | -u] [--refresh] [--ignore-errors] [--] + ... DESCRIPTION ----------- @@ -59,6 +60,7 @@ OPTIONS Be verbose. -f:: +--force:: Allow adding otherwise ignored files. -i:: @@ -75,6 +77,7 @@ OPTIONS the specified filepatterns before exiting. -u:: +--update:: Update only files that git already knows about, staging modified content for commit and marking deleted files for removal. This is similar diff --git a/git-bisect.html b/git-bisect.html index 597bc42be..5d8309af8 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -335,10 +335,9 @@ bad kernel rev in "refs/bisect/bad".

$ git bisect reset
-

to get back to the original branch, instead of being in one of the -bisection branches ("git bisect start" will do that for you too, -actually: it will reset the bisection state, and before it does that -it checks that you're not using some old bisection branch).

+

to get back to the original branch, instead of being on the bisection +commit ("git bisect start" will do that for you too, actually: it will +reset the bisection state).

Bisect visualize

During the bisection process, you can say

@@ -512,7 +511,7 @@ test processes and the scripts.

diff --git a/git-bisect.txt b/git-bisect.txt index 37c7acbe9..3ca0d330a 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -85,10 +85,9 @@ Oh, and then after you want to reset to the original head, do a $ git bisect reset ------------------------------------------------ -to get back to the original branch, instead of being in one of the -bisection branches ("git bisect start" will do that for you too, -actually: it will reset the bisection state, and before it does that -it checks that you're not using some old bisection branch). +to get back to the original branch, instead of being on the bisection +commit ("git bisect start" will do that for you too, actually: it will +reset the bisection state). Bisect visualize ~~~~~~~~~~~~~~~~ -- 2.26.2