From 47b9acd8e0fd4c6b389fd1be997ba8a8c1a36021 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 24 Apr 2007 07:34:34 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-rc0-14-g520d --- config.txt | 4 ++++ git-checkout.html | 4 ++-- git-checkout.txt | 2 +- git-clean.html | 13 +++++++++++-- git-clean.txt | 6 +++++- git-config.html | 11 ++++++++++- git-reset.html | 3 ++- git-reset.txt | 2 ++ 8 files changed, 37 insertions(+), 8 deletions(-) diff --git a/config.txt b/config.txt index b13ff3a1b..e0aff5369 100644 --- a/config.txt +++ b/config.txt @@ -300,6 +300,10 @@ branch..merge:: branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f or -n. Defaults + to false. + color.branch:: A boolean to enable/disable color in the output of gitlink:git-branch[1]. May be set to `true` (or `always`), diff --git a/git-checkout.html b/git-checkout.html index e67e39b28..12ca85062 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -273,7 +273,7 @@ git-checkout(1) Manual Page

SYNOPSIS

-
git-checkout [-q] [-f] [-b [--track | --no-track] <new_branch> [-l]] [-m] [<branch>] +
git-checkout [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] git-checkout [<tree-ish>] <paths>…

DESCRIPTION

@@ -537,7 +537,7 @@ $ git add frotz
diff --git a/git-checkout.txt b/git-checkout.txt index 4f2e847dc..918d8ee72 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch SYNOPSIS -------- [verse] -'git-checkout' [-q] [-f] [-b [--track | --no-track] [-l]] [-m] [] +'git-checkout' [-q] [-f] [[--track | --no-track] -b [-l]] [-m] [] 'git-checkout' [] ... DESCRIPTION diff --git a/git-clean.html b/git-clean.html index 346cfb07d..2688b3785 100644 --- a/git-clean.html +++ b/git-clean.html @@ -273,7 +273,7 @@ git-clean(1) Manual Page

SYNOPSIS

-
git-clean [-d] [-n] [-q] [-x | -X] [--] <paths>…
+
git-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>…

DESCRIPTION

@@ -296,6 +296,15 @@ affected are further limited to those that match them.

+-f +
+
+

+ If the git configuration specifies clean.forceRequire as true, + git-clean will refuse to run unless given -f or -n. +

+
+
-n
@@ -344,7 +353,7 @@ affected are further limited to those that match them.

diff --git a/git-clean.txt b/git-clean.txt index c61afbcdb..5aff026eb 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree SYNOPSIS -------- [verse] -'git-clean' [-d] [-n] [-q] [-x | -X] [--] ... +'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] ... DESCRIPTION ----------- @@ -25,6 +25,10 @@ OPTIONS -d:: Remove untracked directories in addition to untracked files. +-f:: + If the git configuration specifies clean.forceRequire as true, + git-clean will refuse to run unless given -f or -n. + -n:: Don't actually remove anything, just show what would be done. diff --git a/git-config.html b/git-config.html index 2d6093b2f..6bf0d0329 100644 --- a/git-config.html +++ b/git-config.html @@ -967,6 +967,15 @@ branch.<name>.merge

+clean.requireForce +
+
+

+ A boolean to make git-clean do nothing unless given -f or -n. Defaults + to false. +

+
+
color.branch
@@ -1645,7 +1654,7 @@ transfer.unpackLimit diff --git a/git-reset.html b/git-reset.html index 2655e41b7..f5ab326d1 100644 --- a/git-reset.html +++ b/git-reset.html @@ -365,6 +365,7 @@ make corrections to working tree files. commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead.

+

See also the --amend option to git-commit(1).

@@ -566,7 +567,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-reset.txt b/git-reset.txt index 5b55cda51..19c5b9bbd 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -67,6 +67,8 @@ message, or both. Leaves working tree as it was before "reset". <3> "reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. ++ +See also the --amend option to gitlink:git-commit[1]. Undo commits permanently:: + -- 2.26.2