From: Junio C Hamano Date: Tue, 25 Mar 2008 09:11:02 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5-rc1-6-g5cc8f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a14a4031ea339f7f644448239c46721a30c47b9e;p=git.git Autogenerated HTML docs for v1.5.5-rc1-6-g5cc8f --- diff --git a/RelNotes-1.5.5.txt b/RelNotes-1.5.5.txt index 14beed49b..18ff82ba3 100644 --- a/RelNotes-1.5.5.txt +++ b/RelNotes-1.5.5.txt @@ -79,8 +79,9 @@ Updates since v1.5.4 * "git branch" (and "git checkout -b") to branch from a local branch can optionally set "branch..merge" to mark the new branch to build on the other local branch, when "branch.autosetupmerge" is set to - "always". By default, this does not happen when branching from a local - branch. + "always", or when passing the command line option "--track" (this option + was ignored when branching from local branches). By default, this does + not happen when branching from a local branch. * "git checkout" to switch to a branch that has "branch..merge" set (i.e. marked to build on another branch) reports how much the branch diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index a98377c5b..514de13d6 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt @@ -17,7 +17,7 @@ linkgit:git-bundle[1]:: Move objects and refs by archive. linkgit:git-checkout[1]:: - Checkout and switch to a branch. + Checkout a branch or paths to the working tree. linkgit:git-cherry-pick[1]:: Apply the change introduced by an existing commit. diff --git a/git-checkout.html b/git-checkout.html index e5a74dd67..1b5fbff20 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -266,7 +266,7 @@ git-checkout(1) Manual Page

NAME

git-checkout - - Checkout and switch to a branch + Checkout a branch or paths to the working tree

@@ -539,7 +539,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index 4014e7256..e11cddbfc 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -3,7 +3,7 @@ git-checkout(1) NAME ---- -git-checkout - Checkout and switch to a branch +git-checkout - Checkout a branch or paths to the working tree SYNOPSIS -------- diff --git a/git-tag.html b/git-tag.html index 573477415..4ad781045 100644 --- a/git-tag.html +++ b/git-tag.html @@ -287,6 +287,8 @@ git-tag(1) Manual Page creates a tag object, and requires the tag message. Unless -m <msg> or -F <file> is given, an editor is started for the user to type in the tag message.

+

If -m <msg> or -F <file> is given and -a, -s, and -u <key-id> +are absent, -a is implied.

Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag).

A GnuPG signed tag object will be created when -s or -u @@ -373,6 +375,8 @@ GnuPG key for signing.

Use the given tag message (instead of prompting). If multiple -m options are given, there values are concatenated as separate paragraphs. + Implies -a if none of -a, -s, or -u <key-id> + is given.

@@ -382,6 +386,8 @@ GnuPG key for signing.

Take the tag message from the given file. Use - to read the message from the standard input. + Implies -a if none of -a, -s, or -u <key-id> + is given.

@@ -546,7 +552,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tag.txt b/git-tag.txt index b62a3d1c5..c22fb7117 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -26,6 +26,9 @@ creates a 'tag' object, and requires the tag message. Unless `-m ` or `-F ` is given, an editor is started for the user to type in the tag message. +If `-m ` or `-F ` is given and `-a`, `-s`, and `-u ` +are absent, `-a` is implied. + Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag). @@ -68,10 +71,14 @@ OPTIONS Use the given tag message (instead of prompting). If multiple `-m` options are given, there values are concatenated as separate paragraphs. + Implies `-a` if none of `-a`, `-s`, or `-u ` + is given. -F :: Take the tag message from the given file. Use '-' to read the message from the standard input. + Implies `-a` if none of `-a`, `-s`, or `-u ` + is given. CONFIGURATION ------------- diff --git a/git.html b/git.html index d45022540..c4c9b4989 100644 --- a/git.html +++ b/git.html @@ -457,7 +457,7 @@ ancillary user utilities.

- Checkout and switch to a branch. + Checkout a branch or paths to the working tree.

@@ -1946,7 +1946,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/glossary.html b/glossary.html index 9bece8da0..e403aedea 100644 --- a/glossary.html +++ b/glossary.html @@ -347,9 +347,12 @@ div.exampleblock-content {

- The action of updating the working tree to a - revision which was stored in the - object database. + The action of updating all or part of the + working tree with a tree object + or blob from the + object database, and updating the + index and HEAD if the whole working tree has + been pointed at a new branch.

@@ -1079,7 +1082,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/glossary.txt b/glossary.txt index ab4caf4e2..51b63532b 100644 --- a/glossary.txt +++ b/glossary.txt @@ -45,9 +45,12 @@ GIT Glossary "changesets" with git. [[def_checkout]]checkout:: - The action of updating the <> to a - <> which was stored in the - <>. + The action of updating all or part of the + <> with a <> + or <> from the + <>, and updating the + <> and <> if the whole working tree has + been pointed at a new <>. [[def_cherry-picking]]cherry-picking:: In <> jargon, "cherry pick" means to choose a subset of diff --git a/user-manual.html b/user-manual.html index 14c87250b..58d20b999 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1798,7 +1798,7 @@ parsing after calling setup_revisions(). After that prepare_revision_walk() for initialization, and then you can get the commits one by one with the function get_revision().

If you are interested in more details of the revision walking process, just have a look at the first implementation of cmd_log(); call -git-show v1.3.0155^24 and scroll down to that function (note that you +git-show v1.3.0~155^2~4 and scroll down to that function (note that you no longer need to call setup_pager() directly).

Nowadays, git log is a builtin, which means that it is _contained_ in the command git. The source side of a builtin is

  • a function called cmd_<bla>, typically defined in builtin-<bla>.c, @@ -1907,9 +1907,12 @@ itself!

checkout
- The action of updating the working tree to a - revision which was stored in the - object database. + The action of updating all or part of the + working tree with a tree object + or blob from the + object database, and updating the + index and HEAD if the whole working tree has + been pointed at a new branch.
cherry-picking
diff --git a/user-manual.txt b/user-manual.txt index 40b0de087..565aeb980 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -4144,7 +4144,7 @@ commits one by one with the function `get_revision()`. If you are interested in more details of the revision walking process, just have a look at the first implementation of `cmd_log()`; call -`git-show v1.3.0~155^2~4` and scroll down to that function (note that you +`git-show v1.3.0{tilde}155^2{tilde}4` and scroll down to that function (note that you no longer need to call `setup_pager()` directly). Nowadays, `git log` is a builtin, which means that it is _contained_ in the