Skip to content

Commit ba4b928

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.6.2-212-g08b5
1 parent 05bf9c5 commit ba4b928

File tree

237 files changed

+14116
-8654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+14116
-8654
lines changed

‎RelNotes-1.5.6.2.txt‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,30 @@ Futureproof
1111
Fixes since v1.5.6.1
1212
--------------------
1313

14-
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
15-
serious memory and temporary file leak, which made it unusable for
16-
moderately large import.
14+
* "git clone" from a remote that is named with url.insteadOf setting in
15+
$HOME/.gitconfig did not work well.
1716

18-
* "git-svn" mangled remote nickname used in the configuration file
19-
unnecessarily.
17+
* "git describe --long --tags" segfaulted when the described revision was
18+
tagged with a lightweight tag.
2019

2120
* "git diff --check" did not report the result via its exit status
2221
reliably.
2322

23+
* When remote side used to have branch 'foo' and git-fetch finds that now
24+
it has branch 'foo/bar', it refuses to lose the existing remote tracking
25+
branch and its reflog. The error message has been improved to suggest
26+
pruning the remote if the user wants to proceed and get the latest set
27+
of branches from the remote, including such 'foo/bar'.
28+
29+
* "git reset file" should mean the same thing as "git reset HEAD file",
30+
but we required disambiguating -- even when "file" is not ambiguous.
31+
2432
* "git show" segfaulted when an annotated tag that points at another
2533
annotated tag was given to it.
2634

27-
--
28-
exec >/var/tmp/1
29-
echo O=$(git describe maint)
30-
O=v1.5.6.1-13-g4f3dcc2
31-
git shortlog --no-merges $O..maint
35+
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
36+
serious memory and temporary file leak, which made it unusable for
37+
moderately large import.
38+
39+
* "git-svn" mangled remote nickname used in the configuration file
40+
unnecessarily.

‎cmds-mainporcelain.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ linkgit:git-rm[1]::
8686
Remove files from the working tree and from the index.
8787

8888
linkgit:git-shortlog[1]::
89-
Summarize 'git log' output.
89+
Summarize 'git-log' output.
9090

9191
linkgit:git-show[1]::
9292
Show various types of objects.

‎config.txt‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The values following the equals sign in variable assign are all either
6363
a string, an integer, or a boolean. Boolean values may be given as yes/no,
6464
0/1 or true/false. Case is not significant in boolean values, when
6565
converting value to the canonical form using '--bool' type specifier;
66-
`git-config` will ensure that the output is "true" or "false".
66+
'git-config' will ensure that the output is "true" or "false".
6767

6868
String values may be entirely or partially enclosed in double quotes.
6969
You need to enclose variable value in double quotes if you want to
@@ -118,8 +118,8 @@ core.fileMode::
118118
See linkgit:git-update-index[1]. True by default.
119119

120120
core.quotepath::
121-
The commands that output paths (e.g. `ls-files`,
122-
`diff`), when not given the `-z` option, will quote
121+
The commands that output paths (e.g. 'ls-files',
122+
'diff'), when not given the `-z` option, will quote
123123
"unusual" characters in the pathname by enclosing the
124124
pathname in a double-quote pair and with backslashes the
125125
same way strings in C source code are quoted. If this
@@ -356,8 +356,8 @@ core.pager::
356356

357357
core.whitespace::
358358
A comma separated list of common whitespace problems to
359-
notice. `git diff` will use `color.diff.whitespace` to
360-
highlight them, and `git apply --whitespace=error` will
359+
notice. 'git-diff' will use `color.diff.whitespace` to
360+
highlight them, and 'git-apply --whitespace=error' will
361361
consider them as errors:
362362
+
363363
* `trailing-space` treats trailing whitespaces at the end of the line
@@ -396,11 +396,11 @@ it will be treated as a shell command. For example, defining
396396
"gitk --all --not ORIG_HEAD".
397397

398398
apply.whitespace::
399-
Tells `git-apply` how to handle whitespaces, in the same way
399+
Tells 'git-apply' how to handle whitespaces, in the same way
400400
as the '--whitespace' option. See linkgit:git-apply[1].
401401

402402
branch.autosetupmerge::
403-
Tells `git-branch` and `git-checkout` to setup new branches
403+
Tells 'git-branch' and 'git-checkout' to setup new branches
404404
so that linkgit:git-pull[1] will appropriately merge from the
405405
starting point branch. Note that even if this option is not set,
406406
this behavior can be chosen per-branch using the `--track`
@@ -411,7 +411,7 @@ branch.autosetupmerge::
411411
branch. This option defaults to true.
412412

413413
branch.autosetuprebase::
414-
When a new branch is created with `git-branch` or `git-checkout`
414+
When a new branch is created with 'git-branch' or 'git-checkout'
415415
that tracks another branch, this variable tells git to set
416416
up pull to rebase instead of merge (see "branch.<name>.rebase").
417417
When `never`, rebase is never automatically set to true.
@@ -426,20 +426,20 @@ branch.autosetuprebase::
426426
This option defaults to never.
427427

428428
branch.<name>.remote::
429-
When in branch <name>, it tells `git fetch` which remote to fetch.
430-
If this option is not given, `git fetch` defaults to remote "origin".
429+
When in branch <name>, it tells 'git-fetch' which remote to fetch.
430+
If this option is not given, 'git-fetch' defaults to remote "origin".
431431

432432
branch.<name>.merge::
433-
When in branch <name>, it tells `git fetch` the default
433+
When in branch <name>, it tells 'git-fetch' the default
434434
refspec to be marked for merging in FETCH_HEAD. The value is
435435
handled like the remote part of a refspec, and must match a
436436
ref which is fetched from the remote given by
437437
"branch.<name>.remote".
438-
The merge information is used by `git pull` (which at first calls
439-
`git fetch`) to lookup the default branch for merging. Without
440-
this option, `git pull` defaults to merge the first refspec fetched.
438+
The merge information is used by 'git-pull' (which at first calls
439+
'git-fetch') to lookup the default branch for merging. Without
440+
this option, 'git-pull' defaults to merge the first refspec fetched.
441441
Specify multiple values to get an octopus merge.
442-
If you wish to setup `git pull` so that it merges into <name> from
442+
If you wish to setup 'git-pull' so that it merges into <name> from
443443
another branch in the local repository, you can point
444444
branch.<name>.merge to the desired branch, and use the special setting
445445
`.` (a period) for branch.<name>.remote.
@@ -508,12 +508,12 @@ color.diff.<slot>::
508508

509509
color.interactive::
510510
When set to `always`, always use colors for interactive prompts
511-
and displays (such as those used by "git add --interactive").
511+
and displays (such as those used by "git-add --interactive").
512512
When false (or `never`), never. When set to `true` or `auto`, use
513513
colors only when the output is to the terminal. Defaults to false.
514514

515515
color.interactive.<slot>::
516-
Use customized color for `git add --interactive`
516+
Use customized color for 'git-add --interactive'
517517
output. `<slot>` may be `prompt`, `header`, or `help`, for
518518
three distinct types of normal output from interactive
519519
programs. The values of these variables may be specified as
@@ -550,14 +550,14 @@ color.ui::
550550
take precedence over this setting. Defaults to false.
551551

552552
diff.autorefreshindex::
553-
When using `git diff` to compare with work tree
553+
When using 'git-diff' to compare with work tree
554554
files, do not consider stat-only change as changed.
555555
Instead, silently run `git update-index --refresh` to
556556
update the cached stat information for paths whose
557557
contents in the work tree match the contents in the
558558
index. This option defaults to true. Note that this
559-
affects only `git diff` Porcelain, and not lower level
560-
`diff` commands, such as `git diff-files`.
559+
affects only 'git-diff' Porcelain, and not lower level
560+
'diff' commands, such as 'git-diff-files'.
561561

562562
diff.external::
563563
If this config variable is set, diff generation is not
@@ -568,7 +568,7 @@ diff.external::
568568

569569
diff.renameLimit::
570570
The number of files to consider when performing the copy/rename
571-
detection; equivalent to the git diff option '-l'.
571+
detection; equivalent to the 'git-diff' option '-l'.
572572

573573
diff.renames::
574574
Tells git to detect renames. If set to any boolean value, it
@@ -608,7 +608,7 @@ format.pretty::
608608

609609
gc.aggressiveWindow::
610610
The window size parameter used in the delta compression
611-
algorithm used by 'git gc --aggressive'. This defaults
611+
algorithm used by 'git-gc --aggressive'. This defaults
612612
to 10.
613613

614614
gc.auto::
@@ -625,37 +625,37 @@ gc.autopacklimit::
625625
default value is 50. Setting this to 0 disables it.
626626

627627
gc.packrefs::
628-
`git gc` does not run `git pack-refs` in a bare repository by
628+
'git-gc' does not run `git pack-refs` in a bare repository by
629629
default so that older dumb-transport clients can still fetch
630-
from the repository. Setting this to `true` lets `git
631-
gc` to run `git pack-refs`. Setting this to `false` tells
632-
`git gc` never to run `git pack-refs`. The default setting is
630+
from the repository. Setting this to `true` lets 'git-gc'
631+
to run `git pack-refs`. Setting this to `false` tells
632+
'git-gc' never to run `git pack-refs`. The default setting is
633633
`notbare`. Enable it only when you know you do not have to
634634
support such clients. The default setting will change to `true`
635635
at some stage, and setting this to `false` will continue to
636-
prevent `git pack-refs` from being run from `git gc`.
636+
prevent `git pack-refs` from being run from 'git-gc'.
637637

638638
gc.pruneexpire::
639-
When `git gc` is run, it will call `prune --expire 2.weeks.ago`.
639+
When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
640640
Override the grace period with this config variable.
641641

642642
gc.reflogexpire::
643-
`git reflog expire` removes reflog entries older than
643+
'git-reflog expire' removes reflog entries older than
644644
this time; defaults to 90 days.
645645

646646
gc.reflogexpireunreachable::
647-
`git reflog expire` removes reflog entries older than
647+
'git-reflog expire' removes reflog entries older than
648648
this time and are not reachable from the current tip;
649649
defaults to 30 days.
650650

651651
gc.rerereresolved::
652652
Records of conflicted merge you resolved earlier are
653-
kept for this many days when `git rerere gc` is run.
653+
kept for this many days when 'git-rerere gc' is run.
654654
The default is 60 days. See linkgit:git-rerere[1].
655655

656656
gc.rerereunresolved::
657657
Records of conflicted merge you have not resolved are
658-
kept for this many days when `git rerere gc` is run.
658+
kept for this many days when 'git-rerere gc' is run.
659659
The default is 15 days. See linkgit:git-rerere[1].
660660

661661
rerere.enabled::
@@ -821,7 +821,7 @@ i18n.commitEncoding::
821821

822822
i18n.logOutputEncoding::
823823
Character encoding the commit messages are converted to when
824-
running `git-log` and friends.
824+
running 'git-log' and friends.
825825

826826
instaweb.browser::
827827
Specify the program that will be used to browse your working
@@ -844,7 +844,7 @@ instaweb.port::
844844

845845
log.date::
846846
Set default date-time mode for the log command. Setting log.date
847-
value is similar to using git log's --date option. The value is one of
847+
value is similar to using 'git-log'\'s --date option. The value is one of the
848848
following alternatives: {relative,local,default,iso,rfc,short}.
849849
See linkgit:git-log[1].
850850

‎fetch-options.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
-f::
2323
--force::
24-
When `git-fetch` is used with `<rbranch>:<lbranch>`
24+
When 'git-fetch' is used with `<rbranch>:<lbranch>`
2525
refspec, it refuses to update the local branch
2626
`<lbranch>` unless the remote branch `<rbranch>` it
2727
fetches is a descendant of `<lbranch>`. This option
@@ -53,10 +53,10 @@ endif::git-pull[]
5353

5454
-u::
5555
--update-head-ok::
56-
By default `git-fetch` refuses to update the head which
56+
By default 'git-fetch' refuses to update the head which
5757
corresponds to the current branch. This flag disables the
58-
check. This is purely for the internal use for `git-pull`
59-
to communicate with `git-fetch`, and unless you are
58+
check. This is purely for the internal use for 'git-pull'
59+
to communicate with 'git-fetch', and unless you are
6060
implementing your own Porcelain you are not supposed to
6161
use it.
6262

0 commit comments

Comments
 (0)