From 9e96a1aba0e46aba28ff6eaae57784ea5d94b0fb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 16 Aug 2008 10:23:18 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc3-17-gc14c8 --- config.txt | 5 +++++ git-am.html | 16 ++-------------- git-am.txt | 7 +------ git-config.html | 12 +++++++++++- git-stash.html | 21 ++++++++++++++++----- git-stash.txt | 13 ++++++++++--- 6 files changed, 45 insertions(+), 29 deletions(-) diff --git a/config.txt b/config.txt index b8ec01c92..676c39bb8 100644 --- a/config.txt +++ b/config.txt @@ -978,6 +978,11 @@ pack.packSizeLimit:: can be overridden by the `\--max-pack-size` option of linkgit:git-repack[1]. +pager.:: + Allows to set your own pager preferences for each command, overriding + the default. If `\--pager` or `\--no-pager` is specified on the command + line, it takes precedence over this option. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/git-am.html b/git-am.html index 474d025d4..26c85518b 100644 --- a/git-am.html +++ b/git-am.html @@ -322,7 +322,7 @@ git-am(1) Manual Page
git am [--signoff] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] + [--3way] [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] [<mbox> | <Maildir>…] git am (--skip | --resolved | --abort)
@@ -410,18 +410,6 @@ default. You could use --no-utf8 to override this.

--b -
-
---binary -
-
-

- Pass --allow-binary-replacement flag to git-apply - (see git-apply(1)). -

-
-
--whitespace=<option>
@@ -585,7 +573,7 @@ errors in the "From:" lines).

diff --git a/git-am.txt b/git-am.txt index c45c53ec2..b9c6fac74 100644 --- a/git-am.txt +++ b/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] + [--3way] [--interactive] [--whitespace=
+pager.<cmd> +
+
+

+ Allows to set your own pager preferences for each command, overriding + the default. If --pager or --no-pager is specified on the command + line, it takes precedence over this option. +

+
+
pull.octopus
@@ -2700,7 +2710,7 @@ web.browser diff --git a/git-stash.html b/git-stash.html index 9e61785f4..22a945fde 100644 --- a/git-stash.html +++ b/git-stash.html @@ -321,11 +321,13 @@ git-stash(1) Manual Page

SYNOPSIS

-
git stash list -git stash (show | apply | drop | pop ) [<stash>] +
git stash list [<options>] +git stash (show | drop | pop ) [<stash>] +git stash apply [--index] [<stash>] git stash branch <branchname> [<stash>] -git stash [save [<message>]] -git stash clear
+git stash [save [--keep-index] [<message>]] +git stash clear +git stash create

DESCRIPTION

@@ -454,6 +456,15 @@ pop [<stash>] stash@{0} is assumed. See also apply.

+
+create +
+
+

+ Create a stash (which is a regular commit object) and return its + object name, without storing it anywhere in the ref namespace. +

+

DISCUSSION

@@ -574,7 +585,7 @@ $ git commit foo -m 'Remaining parts' diff --git a/git-stash.txt b/git-stash.txt index 7d50d74cc..49e2296a2 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -8,11 +8,13 @@ git-stash - Stash the changes in a dirty working directory away SYNOPSIS -------- [verse] -'git stash' list -'git stash' (show | apply | drop | pop ) [] +'git stash' list [] +'git stash' (show | drop | pop ) [] +'git stash' apply [--index] [] 'git stash' branch [] -'git stash' [save []] +'git stash' [save [--keep-index] []] 'git stash' clear +'git stash' create DESCRIPTION ----------- @@ -116,6 +118,11 @@ pop []:: of the current working tree state. When no `` is given, `stash@\{0}` is assumed. See also `apply`. +create:: + + Create a stash (which is a regular commit object) and return its + object name, without storing it anywhere in the ref namespace. + DISCUSSION ---------- -- 2.26.2