From: Junio C Hamano Date: Thu, 21 Jan 2010 04:28:49 +0000 (-0800) Subject: Merge remote branch 'remotes/trast-doc/for-next' X-Git-Tag: v1.7.0-rc0~57 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=add0951ab0bee43b5f634d1be68a7a80f627c18f;p=git.git Merge remote branch 'remotes/trast-doc/for-next' * remotes/trast-doc/for-next: Documentation: spell 'git cmd' without dash throughout Documentation: format full commands in typewriter font Documentation: warn prominently against merging with dirty trees Documentation/git-merge: reword references to "remote" and "pull" Conflicts: Documentation/config.txt Documentation/git-config.txt Documentation/git-merge.txt --- add0951ab0bee43b5f634d1be68a7a80f627c18f diff --cc Documentation/config.txt index d40b83f85,7da332f0c..8dcb19156 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -510,12 -502,8 +510,12 @@@ notes should be printed This setting defaults to "refs/notes/commits", and can be overridden by the `GIT_NOTES_REF` environment variable. +core.sparseCheckout:: + Enable "sparse checkout" feature. See section "Sparse checkout" in + linkgit:git-read-tree[1] for more information. + add.ignore-errors:: - Tells 'git-add' to continue adding files when some files cannot be + Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the '--ignore-errors' option of linkgit:git-add[1]. @@@ -549,7 -537,7 +549,7 @@@ apply.whitespace: as the '--whitespace' option. See linkgit:git-apply[1]. branch.autosetupmerge:: - Tells 'git-branch' and 'git-checkout' to set up new branches - Tells 'git branch' and 'git checkout' to setup new branches ++ Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` @@@ -733,8 -724,8 +733,8 @@@ diff.autorefreshindex: update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this - affects only 'git-diff' Porcelain, and not lower level - 'diff' commands such as 'git-diff-files'. + affects only 'git diff' Porcelain, and not lower level - 'diff' commands, such as 'git diff-files'. ++ 'diff' commands such as 'git diff-files'. diff.external:: If this config variable is set, diff generation is not @@@ -849,9 -840,9 +849,9 @@@ format.pretty: linkgit:git-whatchanged[1]. format.thread:: - The default threading style for 'git-format-patch'. Can be + The default threading style for 'git format-patch'. Can be - either a boolean value, `shallow` or `deep`. `shallow` - threading makes every mail a reply to the head of the series, + a boolean value, or `shallow` or `deep`. `shallow` threading + makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `\--in-reply-to`, and the first patch mail, in this order. `deep` threading makes every mail a reply to the previous one. @@@ -884,15 -875,18 +884,15 @@@ gc.autopacklimit: default value is 50. Setting this to 0 disables it. gc.packrefs:: - 'git gc' does not run `git pack-refs` in a bare repository by - default so that older dumb-transport clients can still fetch - from the repository. Setting this to `true` lets 'git gc' - to run `git pack-refs`. Setting this to `false` tells - 'git gc' never to run `git pack-refs`. The default setting is - `notbare`. Enable it only when you know you do not have to - support such clients. The default setting will change to `true` - at some stage, and setting this to `false` will continue to - prevent `git pack-refs` from being run from 'git gc'. + Running `git pack-refs` in a repository renders it + unclonable by Git versions prior to 1.5.1.2 over dumb + transports such as HTTP. This variable determines whether - 'git gc' runs `git pack-refs`. This can be set to "nobare" ++ 'git gc' runs `git pack-refs`. This can be set to `nobare` + to enable it within all non-bare repos or it can be set to a + boolean value. The default is `true`. gc.pruneexpire:: - When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'. + When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. The value "now" may be used to disable this grace period and always prune unreachable objects immediately. diff --cc Documentation/git-config.txt index 263292809,3c8d895dd..543dd64a4 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@@ -37,12 -37,11 +37,12 @@@ existing values that match the regexp a you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <>). -The type specifier can be either '--int' or '--bool', which will make +The type specifier can be either '--int' or '--bool', to make - 'git-config' ensure that the variable(s) are of the given type and + 'git config' ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, -a "true" or "false" string for bool). If no type specifier is passed, -no checks or transformations are performed on the value. +a "true" or "false" string for bool), or '--path', which does some +path expansion (see '--path' below). If no type specifier is passed, no +checks or transformations are performed on the value. The file-option can be one of '--system', '--global' or '--file' which specify where the values will be read from or written to. @@@ -134,16 -133,9 +134,16 @@@ See also <> by 1024, 1048576, or 1073741824 prior to output. --bool-or-int:: - 'git-config' will ensure that the output matches the format of + 'git config' will ensure that the output matches the format of either --bool or --int, as described above. +--path:: + 'git-config' will expand leading '{tilde}' to the value of + '$HOME', and '{tilde}user' to the home directory for the + specified user. This option has no effect when setting the + value (but you can use 'git config bla {tilde}/' from the + command line to let your shell do the expansion). + -z:: --null:: For all options that output values and/or keys, always diff --cc Documentation/git-http-backend.txt index c8fe08a0c,4b2edd3f7..07931c687 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@@ -18,16 -18,11 +18,16 @@@ The program supports clients fetching u and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol. +It verifies that the directory has the magic file +"git-daemon-export-ok", and it will refuse to export any git directory +that hasn't explicitly been marked for export this way (unless the +GIT_HTTP_EXPORT_ALL environmental variable is set). + By default, only the `upload-pack` service is enabled, which serves - 'git-fetch-pack' and 'git-ls-remote' clients, which are invoked from - 'git-fetch', 'git-pull', and 'git-clone'. If the client is authenticated, - the `receive-pack` service is enabled, which serves 'git-send-pack' - clients, which is invoked from 'git-push'. + 'git fetch-pack' and 'git ls-remote' clients, which are invoked from + 'git fetch', 'git pull', and 'git clone'. If the client is authenticated, + the `receive-pack` service is enabled, which serves 'git send-pack' + clients, which is invoked from 'git push'. SERVICES -------- diff --cc Documentation/git-merge.txt index 67470311e,c88bebe36..d4ef0d0ce --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@@ -10,8 -10,8 +10,8 @@@ SYNOPSI -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ]... - [--[no-]rerere-autoupdate] [-m ] ... - 'git merge' HEAD ... - [-m ] ... ++ [--[no-]rerere-autoupdate] [-m ] ... + 'git merge' HEAD ... DESCRIPTION ----------- @@@ -33,15 -37,10 +37,15 @@@ include::merge-options.txt[ used to give a good default for automated 'git merge' invocations. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + - ...:: - Other branch heads to merge into our branch. You need at - least one . Specifying more than one - obviously means you are trying an Octopus. + ...:: + Commits, usually other branch heads, to merge into our branch. + You need at least one . Specifying more than one + obviously means you are trying an Octopus. include::merge-strategies.txt[] diff --cc Documentation/git-rebase.txt index e2e61d364,105e89507..89a957ef7 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -392,14 -382,11 +392,14 @@@ If you just want to edit the commit mes command "pick" with the command "reword". If you want to fold two or more commits into one, replace the command -"pick" with "squash" for the second and subsequent commit. If the -commits had different authors, it will attribute the squashed commit to -the author of the first commit. +"pick" for the second and subsequent commits with "squash" or "fixup". +If the commits had different authors, the folded commit will be +attributed to the author of the first commit. The suggested commit +message for the folded commit is the concatenation of the commit +messages of the first commit and of those with the "squash" command, +but omits the commit messages of commits with the "fixup" command. - 'git-rebase' will stop when "pick" has been replaced with "edit" or + 'git rebase' will stop when "pick" has been replaced with "edit" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`. diff --cc Documentation/git-update-index.txt index 8d88018ee,e8c19be50..68dc1879f --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@@ -104,16 -103,9 +104,16 @@@ you will need to handle the situation m Like '--refresh', but checks stat information unconditionally, without regard to the "assume unchanged" setting. +--skip-worktree:: +--no-skip-worktree:: + When one of these flags is specified, the object name recorded + for the paths are not updated. Instead, these options + set and unset the "skip-worktree" bit for the paths. See + section "Skip-worktree bit" below for more information. + -g:: --again:: - Runs 'git-update-index' itself on the paths whose index + Runs 'git update-index' itself on the paths whose index entries are different from those from the `HEAD` commit. --unresolve::