From 46a38aa8be7b8f7b5afdeeea0744859b3e03d5a2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 14 Jul 2008 03:13:27 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.6.3-315-g10ce0 --- RelNotes-1.5.6.3.txt | 26 ++++-- git-add.html | 189 +++++++++++++++++++++++++++---------------- git-add.txt | 1 + git-am.html | 6 +- git-am.txt | 4 +- git-log.html | 10 ++- git-mailinfo.html | 12 ++- git-mailinfo.txt | 5 +- git-rev-list.html | 10 ++- git-stash.html | 52 +++++++++++- git-stash.txt | 42 +++++++++- git.html | 2 +- git.txt | 3 +- rev-list-options.txt | 4 + 14 files changed, 270 insertions(+), 96 deletions(-) diff --git a/RelNotes-1.5.6.3.txt b/RelNotes-1.5.6.3.txt index dd0559b64..942611299 100644 --- a/RelNotes-1.5.6.3.txt +++ b/RelNotes-1.5.6.3.txt @@ -4,8 +4,16 @@ GIT v1.5.6.3 Release Notes Fixes since v1.5.6.2 -------------------- +* Setting core.sharerepository to traditional "true" value was supposed to make + the repository group writable but should not affect permission for others. + However, since 1.5.6, it was broken to drop permission for others when umask is + 022, making the repository unreadable by others. + * Setting GIT_TRACE will report spawning of external process via run_command(). +* Using an object with very deep delta chain pinned memory needed for extracting + intermediate base objects unnecessarily long, leading to excess memory usage. + * Bash completion script did not notice '--' marker on the command line and tried the relatively slow "ref completion" even when completing arguments after one. @@ -14,6 +22,12 @@ Fixes since v1.5.6.2 tree file for it confused "racy-git avoidance" logic into thinking that the path is now unchanged. +* The section that describes attributes related to git-archive were placed + in a wrong place in the gitattributes(5) manual page. + +* "git am" was not helpful to the users when it detected that the committer + information is not set up properly yet. + * "git clone" had a leftover debugging fprintf(). * "git clone -q" was not quiet enough as it used to and gave object count @@ -23,8 +37,10 @@ Fixes since v1.5.6.2 good thing if the remote side is well packed but otherwise not, especially for a project that is not really big. -* The section that describes attributes related to git-archive were placed - in a wrong place in the gitattributes(5) manual page. +* "git daemon" used to call syslog() from a signal handler, which + could raise signals of its own but generally is not reentrant. This + was fixed by restructuring the code to report syslog() after the handler + returns. * When "git push" tries to remove a remote ref, and corresponding tracking ref is missing, we used to report error (i.e. failure to @@ -34,9 +50,3 @@ Fixes since v1.5.6.2 MIME multipart mail correctly. Contains other various documentation fixes. - --- -exec >/var/tmp/1 -O=v1.5.6.2-23-ge965647 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint diff --git a/git-add.html b/git-add.html index 7ce159e7c..ebfafcd8a 100644 --- a/git-add.html +++ b/git-add.html @@ -3,7 +3,7 @@ - + git-add(1) @@ -277,33 +325,33 @@ git-add(1) Manual Page [--update | -u] [--refresh] [--ignore-errors] [--] <filepattern>… -

DESCRIPTION

+

DESCRIPTION

-

This command adds the current content of new or modified files to the -index, thus staging that content for inclusion in the next commit.

-

The "index" holds a snapshot of the content of the working tree, and it +

This command adds the current content of new or modified files to the +index, thus staging that content for inclusion in the next commit.

+

The "index" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working directory, and before running the commit command, you must use the add command to add any new or -modified files to the index.

-

This command can be performed multiple times before a commit. It only +modified files to the index.

+

This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then -you must run git add again to add the new content to the index.

-

The git status command can be used to obtain a summary of which -files have changes that are staged for the next commit.

-

The git add command will not add ignored files by default. If any +you must run git add again to add the new content to the index.

+

The git status command can be used to obtain a summary of which +files have changes that are staged for the next commit.

+

The git add command will not add ignored files by default. If any ignored files were explicitly specified on the command line, git add will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The add command can -be used to add ignored files with the -f (force) option.

-

Please see git-commit(1) for alternative ways to add content to a -commit.

+be used to add ignored files with the -f (force) option.

+

Please see git-commit(1) for alternative ways to add content to a +commit.

-

OPTIONS

+

OPTIONS

-
+
<filepattern>…
@@ -422,18 +470,18 @@ commit.

for command-line options).

-
+
-

Configuration

+

Configuration

-

The optional configuration variable core.excludesfile indicates a path to a +

The optional configuration variable core.excludesfile indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See gitrepository-layout(5).

+those in info/exclude. See gitrepository-layout(5).

-

EXAMPLES

+

EXAMPLES

-
-

Because this example lets shell expand the asterisk (i.e. you are +

Because this example lets shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider -subdir/git-foo.sh.

+subdir/git-foo.sh.

- + -

Interactive mode

+

Interactive mode

-

When the command enters the interactive mode, it shows the +

When the command enters the interactive mode, it shows the output of the status subcommand, and then goes into its -interactive command loop.

-

The command loop shows the list of subcommands available, and +interactive command loop.

+

The command loop shows the list of subcommands available, and gives a prompt "What now> ". In general, when the prompt ends with a single >, you can pick only one of the choices given -and type return, like this:

+and type return, like this:

    *** Commands ***
@@ -477,10 +525,10 @@ and type return, like this:

       5: patch        6: diff         7: quit         8: help
     What now> 1
-

You also could say "s" or "sta" or "status" above as long as the -choice is unique.

-

The main command loop has 6 subcommands (plus help and quit).

-
+

You also could say "s" or "sta" or "status" above as long as the +choice is unique.

+

The main command loop has 6 subcommands (plus help and quit).

+
status
@@ -498,7 +546,7 @@ status 1: binary nothing foo.png 2: +403/-35 +1/-1 git-add--interactive.perl
-

It shows that foo.png has differences from HEAD (but that is +

It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, @@ -506,7 +554,7 @@ version (if the working tree version were also different, other file, git-add--interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and -one deletion).

+one deletion).

update @@ -520,22 +568,22 @@ update 2,3,4,5,7,9 from the list. You can say * to choose everything.

-

What you chose are then highlighted with *, -like this:

+

What you chose are then highlighted with *, +like this:

           staged     unstaged path
   1:       binary      nothing foo.png
 * 2:     +403/-35        +1/-1 git-add--interactive.perl
-

To remove selection, prefix the input with - -like this:

+

To remove selection, prefix the input with - +like this:

Update>> -2
-

After making the selection, answer with an empty line to stage the -contents of working tree files for selected paths in the index.

+

After making the selection, answer with an empty line to stage the +contents of working tree files for selected paths in the index.

revert @@ -577,10 +625,11 @@ J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks +e - manually edit the current hunk ? - print help -

After deciding the fate for all hunks, if there is any hunk -that was chosen, the index is updated with the selected hunks.

+

After deciding the fate for all hunks, if there is any hunk +that was chosen, the index is updated with the selected hunks.

diff @@ -591,39 +640,39 @@ diff HEAD and index).

- + -

Bugs

+

Bugs

-

The interactive mode does not work with files whose names contain +

The interactive mode does not work with files whose names contain characters that need C-quoting. core.quotepath configuration can be used to work this limitation around to some degree, but backslash, -double-quote and control characters will still have problems.

+double-quote and control characters will still have problems.

-

SEE ALSO

+

SEE ALSO

-

git-status(1) +

git-status(1) git-rm(1) git-reset(1) git-mv(1) git-commit(1) -git-update-index(1)

+git-update-index(1)

-

Author

+

Author

-

Written by Linus Torvalds <torvalds@osdl.org>

+

Written by Linus Torvalds <torvalds@osdl.org>

-

Documentation

+

Documentation

-

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

+

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-add.txt b/git-add.txt index 011a74365..46dd56c12 100644 --- a/git-add.txt +++ b/git-add.txt @@ -236,6 +236,7 @@ patch:: k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks + e - manually edit the current hunk ? - print help + After deciding the fate for all hunks, if there is any hunk diff --git a/git-am.html b/git-am.html index 7fcfa1333..b913f1ad2 100644 --- a/git-am.html +++ b/git-am.html @@ -324,8 +324,8 @@ git-am(1) Manual Page
git am [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] - <mbox>|<Maildir>… -git am [--skip | --resolved]
+ [<mbox> | <Maildir>…] +git am (--skip | --resolved)

DESCRIPTION

@@ -572,7 +572,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 3863eebce..eeb23b25b 100644 --- a/git-am.txt +++ b/git-am.txt @@ -12,8 +12,8 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=
+--children +
+
+

+ Print the children of the commit. +

+
+
--left-right
@@ -2012,7 +2020,7 @@ reversible operation.

diff --git a/git-mailinfo.html b/git-mailinfo.html index 6ebda7a71..6bb6bcb00 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -320,7 +320,7 @@ git-mailinfo(1) Manual Page

SYNOPSIS

-

git mailinfo [-k] [-u | --encoding=<encoding>] <msg> <patch>

+

git mailinfo [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>

DESCRIPTION

@@ -372,6 +372,14 @@ conversion, even with this flag.

+-n +
+
+

+ Disable all charset re-coding of the metadata. +

+
+
<msg>
@@ -405,7 +413,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-mailinfo.txt b/git-mailinfo.txt index cc52db3be..316bcc679 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message SYNOPSIS -------- -'git mailinfo' [-k] [-u | --encoding=] +'git mailinfo' [-k] [-u | --encoding= | -n] DESCRIPTION @@ -46,6 +46,9 @@ conversion, even with this flag. from what is specified by i18n.commitencoding, this flag can be used to override it. +-n:: + Disable all charset re-coding of the metadata. + :: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. diff --git a/git-rev-list.html b/git-rev-list.html index 29ad5b374..7706492d2 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -485,6 +485,14 @@ format, often found in E-mail messages.

+--children +
+
+

+ Print the children of the commit. +

+
+
--timestamp
@@ -1327,7 +1335,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-stash.html b/git-stash.html index 97aa37e21..9e61785f4 100644 --- a/git-stash.html +++ b/git-stash.html @@ -321,8 +321,11 @@ git-stash(1) Manual Page

SYNOPSIS

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

DESCRIPTION

@@ -347,7 +350,7 @@ is also possible).

-save [<message>] +save [--keep-index] [<message>]

@@ -356,6 +359,8 @@ save [<message>] subcommand is given. The <message> part is optional and gives the description along with the stashed state.

+

If the --keep-index option is used, all changes already added to the +index are left intact.

list [<options>] @@ -405,6 +410,23 @@ have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).

+branch <branchname> [<stash>] +
+
+

+ Creates and checks out a new branch named <branchname> starting from + the commit at which the <stash> was originally created, applies the + changes recorded in <stash> to the new working tree and index, then + drops the <stash> if that completes successfully. When no <stash> + is given, applies the latest one. +

+

This is useful if the branch on which you ran git stash save has +changed enough that git stash apply fails due to conflicts. Since +the stash is applied on top of the commit that was HEAD at the time +git stash was run, it restores the originally stashed state with +no conflicts.

+
+
clear
@@ -511,6 +533,28 @@ $ git stash apply ... continue hacking ...
+
+Testing partial commits +
+
+

+You can use git stash save --keep-index when you want to make two or +more commits out of the changes in the work tree, and you want to test +each change before committing: +

+
+
+
... hack hack hack ...
+$ git add --patch foo            # add just first part to the index
+$ git stash save --keep-index    # save all other changes to the stash
+$ edit/build/test first part
+$ git commit foo -m 'First part' # commit fully tested change
+$ git stash pop                  # prepare to work on all other changes
+... repeat above five steps until one commit remains ...
+$ edit/build/test remaining parts
+$ git commit foo -m 'Remaining parts'
+
+

SEE ALSO

@@ -530,7 +574,7 @@ $ git stash apply diff --git a/git-stash.txt b/git-stash.txt index 9b6b91109..7d50d74cc 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -8,8 +8,11 @@ git-stash - Stash the changes in a dirty working directory away SYNOPSIS -------- [verse] -'git stash' (list | show [] | apply [] | clear | drop [] | pop []) +'git stash' list +'git stash' (show | apply | drop | pop ) [] +'git stash' branch [] 'git stash' [save []] +'git stash' clear DESCRIPTION ----------- @@ -36,12 +39,15 @@ is also possible). OPTIONS ------- -save []:: +save [--keep-index] []:: Save your local modifications to a new 'stash', and run `git reset --hard` to revert them. This is the default action when no subcommand is given. The part is optional and gives the description along with the stashed state. ++ +If the `--keep-index` option is used, all changes already added to the +index are left intact. list []:: @@ -81,6 +87,20 @@ tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally). +branch []:: + + Creates and checks out a new branch named `` starting from + the commit at which the `` was originally created, applies the + changes recorded in `` to the new working tree and index, then + drops the `` if that completes successfully. When no `` + is given, applies the latest one. ++ +This is useful if the branch on which you ran `git stash save` has +changed enough that `git stash apply` fails due to conflicts. Since +the stash is applied on top of the commit that was HEAD at the time +`git stash` was run, it restores the originally stashed state with +no conflicts. + clear:: Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. @@ -169,6 +189,24 @@ $ git stash apply ... continue hacking ... ---------------------------------------------------------------- +Testing partial commits:: + +You can use `git stash save --keep-index` when you want to make two or +more commits out of the changes in the work tree, and you want to test +each change before committing: ++ +---------------------------------------------------------------- +... hack hack hack ... +$ git add --patch foo # add just first part to the index +$ git stash save --keep-index # save all other changes to the stash +$ edit/build/test first part +$ git commit foo -m 'First part' # commit fully tested change +$ git stash pop # prepare to work on all other changes +... repeat above five steps until one commit remains ... +$ edit/build/test remaining parts +$ git commit foo -m 'Remaining parts' +---------------------------------------------------------------- + SEE ALSO -------- linkgit:git-checkout[1], diff --git a/git.html b/git.html index d4a974c91..53a20c73b 100644 --- a/git.html +++ b/git.html @@ -2024,7 +2024,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 4ecdc9f87..27b9d31f7 100644 --- a/git.txt +++ b/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.5.6.2/git.html[documentation for release 1.5.6.2] +* link:v1.5.6.3/git.html[documentation for release 1.5.6.3] * release notes for + link:RelNotes-1.5.6.3.txt[1.5.6.3]. link:RelNotes-1.5.6.2.txt[1.5.6.2]. link:RelNotes-1.5.6.1.txt[1.5.6.1]. link:RelNotes-1.5.6.txt[1.5.6]. diff --git a/rev-list-options.txt b/rev-list-options.txt index 37dd1d61e..b6f5d87e7 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -45,6 +45,10 @@ endif::git-rev-list[] Print the parents of the commit. +--children:: + + Print the children of the commit. + ifdef::git-rev-list[] --timestamp:: Print the raw commit timestamp. -- 2.26.2