From bfe9e75ebe8d3a83be46406130c76d54f8b14289 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 5 Apr 2006 21:43:28 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.3.0-rc2-gae5d --- diff-options.txt | 4 ++++ git-commit.html | 28 ++++++++++++++++++++++++++-- git-commit.txt | 24 +++++++++++++++++++++++- git-diff-files.html | 11 ++++++++++- git-diff-index.html | 11 ++++++++++- git-diff-stages.html | 11 ++++++++++- git-diff-tree.html | 11 ++++++++++- 7 files changed, 93 insertions(+), 7 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index 2a0275ee..ec6811c7 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -69,6 +69,10 @@ changeset, not just the files that contain the change in . +--pickaxe-regex:: + Make the not a plain string but an extended POSIX + regex to match. + -O:: Output the patch in the order specified in the , which has one shell glob pattern per line. diff --git a/git-commit.html b/git-commit.html index 16f2211f..08d93db4 100644 --- a/git-commit.html +++ b/git-commit.html @@ -274,7 +274,8 @@ git-commit(1) Manual Page
git-commit [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] - [-e] [--author <author>] [--] [[-i | -o ]<file>…]
+ [--no-verify] [--amend] [-e] [--author <author>] + [--] [[-i | -o ]<file>…]

DESCRIPTION

@@ -380,6 +381,29 @@ information.

+--amend +
+
+

+ Used to amend the tip of the current branch. Prepare the tree + object you would want to replace the latest commit as usual + (this includes the usual -i/-o and explicit paths), and the + commit log editor is seeded with the commit message from the + tip of the current branch. The commit you create replaces the + current tip — if it was a merge, it will have the parents of + the current tip as parents — so the current top commit is + discarded. +

+

It is a rough equivalent for:

+
+
+
        $ git reset --soft HEAD^
+        $ ... do something else to come up with the right tree ...
+        $ git commit -c ORIG_HEAD
+
+

but can be used to amend a merge commit.

+
+
-i|--include
@@ -482,7 +506,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index d04b342a..2af472a5 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -9,7 +9,8 @@ SYNOPSIS -------- [verse] 'git-commit' [-a] [-s] [-v] [(-c | -C) | -F | -m ] - [-e] [--author ] [--] [[-i | -o ]...] + [--no-verify] [--amend] [-e] [--author ] + [--] [[-i | -o ]...] DESCRIPTION ----------- @@ -71,6 +72,27 @@ OPTIONS commit log message unmodified. This option lets you further edit the message taken from these sources. +--amend:: + + Used to amend the tip of the current branch. Prepare the tree + object you would want to replace the latest commit as usual + (this includes the usual -i/-o and explicit paths), and the + commit log editor is seeded with the commit message from the + tip of the current branch. The commit you create replaces the + current tip -- if it was a merge, it will have the parents of + the current tip as parents -- so the current top commit is + discarded. ++ +It is a rough equivalent for: ++ +------------ + $ git reset --soft HEAD^ + $ ... do something else to come up with the right tree ... + $ git commit -c ORIG_HEAD +------------ ++ +but can be used to amend a merge commit. + -i|--include:: Instead of committing only the files specified on the command line, update them in the index file and then diff --git a/git-diff-files.html b/git-diff-files.html index 1f7197aa..6af9abeb 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -431,6 +431,15 @@ same as "git-diff-index" and "git-diff-tree".

+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
-O<orderfile>
@@ -805,7 +814,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 0523b060..8e075879 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -432,6 +432,15 @@ entries in the index are compared.

+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
-O<orderfile>
@@ -895,7 +904,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index c57b71e7..1fd8955c 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -429,6 +429,15 @@ unmerged index file.

+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
-O<orderfile>
@@ -779,7 +788,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 4ced0304..508d336c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -434,6 +434,15 @@ git-diff-tree(1) Manual Page

+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
-O<orderfile>
@@ -955,7 +964,7 @@ two unresolved merge parents with the working tree file -- 2.11.0