From 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Tue, 15 Jul 2008 15:49:03 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.6.3-350-g6c11a
---
RelNotes-1.6.0.txt | 18 +++++++++++++++-
git-add.html | 7 +++---
git-add.txt | 5 +++--
git-am.html | 7 +++++-
git-am.txt | 6 ++++++
git-branch.html | 27 ++++++++++++-----------
git-branch.txt | 27 ++++++++++++-----------
git-merge.html | 6 ++++--
git-merge.txt | 4 +++-
git-rebase.html | 5 +++--
git-rebase.txt | 3 ++-
git-submodule.html | 34 ++++++++++++++++++++---------
git-submodule.txt | 36 +++++++++++++++++++++++--------
gittutorial.html | 52 +++++++++++++++++++++++++++++++-------------
gittutorial.txt | 54 ++++++++++++++++++++++++++++++++++------------
15 files changed, 205 insertions(+), 86 deletions(-)
diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt
index 9125ee01a..89ea1e938 100644
--- a/RelNotes-1.6.0.txt
+++ b/RelNotes-1.6.0.txt
@@ -110,6 +110,9 @@ Updates since v1.5.6
* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
manually.
+* git-am records the original tip of the branch in ORIG_HEAD before it
+ starts applying patches.
+
* git-apply can handle a patch that touches the same path more than once
much better than before.
@@ -126,6 +129,14 @@ Updates since v1.5.6
similar to the way git-checkout reports by how many commits your branch
is ahead/behind.
+* git-branch's --contains option used to always require a commit parameter
+ to limit the branches with; it now defaults to list branches that
+ contains HEAD if this parameter is omitted.
+
+* git-branch's --merged and --no-merged option used to always limit the
+ branches relative to the HEAD, but they can now take an optional commit
+ argument that is used in place of HEAD.
+
* git-bundle can read the revision arguments from the standard input.
* git-cherry-pick can replay a root commit now.
@@ -144,6 +155,9 @@ Updates since v1.5.6
* fast-export learned to export and import marks file; this can be used to
interface with fast-import incrementally.
+* git-rebase records the original tip of branch in ORIG_HEAD before it is
+ rewound.
+
* "git rerere" can be told to update the index with auto-reused resolution
with rerere.autoupdate configuration variable.
@@ -152,6 +166,8 @@ Updates since v1.5.6
* git-send-mail can talk not just over SSL but over TLS now.
+* git-shortlog honors custom output format specified with "--pretty=format:".
+
* "git-stash save" learned --keep-index option. This lets you stash away the
local changes and bring the changes staged in the index to your working
tree for examination and testing.
@@ -185,6 +201,6 @@ this release, unless otherwise noted.
---
exec >/var/tmp/1
-O=v1.5.6.3-315-g10ce020
+O=v1.5.6.3-350-g499027b
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 ebfafcd8a..643a85d76 100644
--- a/git-add.html
+++ b/git-add.html
@@ -565,8 +565,9 @@ update
"Update>>". When the prompt ends with double >>, you can
make more than one selection, concatenated with whitespace or
comma. Also you can say ranges. E.g. "2-5 7,9" to choose
- 2,3,4,5,7,9 from the list. You can say * to choose
- everything.
+ 2,3,4,5,7,9 from the list. If the second number in a range is
+ omitted, all remaining patches are taken. E.g. "7-" to choose
+ 7,8,9 from the list. You can say * to choose everything.
What you chose are then highlighted with *,
like this:
@@ -672,7 +673,7 @@ double-quote and control characters will still have problems.