From: Junio C Hamano Date: Fri, 17 Aug 2007 07:48:05 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc5-15-ga9ab2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c1f2c7512cc132bb2ac42233fea8cd1ef4c31f9;p=git.git Autogenerated HTML docs for v1.5.3-rc5-15-ga9ab2 --- diff --git a/git-add.html b/git-add.html index 807f3cad9..8637be6ab 100644 --- a/git-add.html +++ b/git-add.html @@ -289,10 +289,12 @@ run; if you want subsequent changes included in the next commit, then you must run git add again to add the new content to the index.

The git status command can be used to obtain a summary of which files have changes that are staged for the next commit.

-

The add command can be used to add ignored files with -f (force) -option, but they have to be explicitly and exactly specified from the -command line. File globbing and recursive behaviour do not add ignored -files.

+

The git add command will not add ignored files by default. If any +ignored files were explicitly specified on the command line, git add +will fail with a list of ignored files. Ignored files reached by +directory recursion or filename globbing will be silently ignored. +The add command can be used to add ignored files with the -f +(force) option.

Please see git-commit(1) for alternative ways to add content to a commit.

@@ -566,7 +568,7 @@ diff diff --git a/git-add.txt b/git-add.txt index dee38f825..3383aca9a 100644 --- a/git-add.txt +++ b/git-add.txt @@ -28,10 +28,12 @@ you must run 'git add' again to add the new content to the index. The 'git status' command can be used to obtain a summary of which files have changes that are staged for the next commit. -The 'add' command can be used to add ignored files with `-f` (force) -option, but they have to be explicitly and exactly specified from the -command line. File globbing and recursive behaviour do not add ignored -files. +The 'git add' command will not add ignored files by default. If any +ignored files were explicitly specified on the command line, 'git add' +will fail with a list of ignored files. Ignored files reached by +directory recursion or filename globbing will be silently ignored. +The 'add' command can be used to add ignored files with the `-f` +(force) option. Please see gitlink:git-commit[1] for alternative ways to add content to a commit. diff --git a/git-rebase.html b/git-rebase.html index 6a4a262ff..88f4404f3 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -382,7 +382,7 @@ the following situation:

then the command

-
git-rebase --onto topicA~5 topicA~2 topicA
+
git-rebase --onto topicA~5 topicA~3 topicA

would result in the removal of commits F and G:

@@ -744,7 +744,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-rebase.txt b/git-rebase.txt index 96907d486..a1b6dce73 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -130,7 +130,7 @@ the following situation: then the command - git-rebase --onto topicA~5 topicA~2 topicA + git-rebase --onto topicA~5 topicA~3 topicA would result in the removal of commits F and G: