Skip to content

Commit 1aa40d2

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
1 parent a9701f0 commit 1aa40d2

File tree

229 files changed

+1801
-1512
lines changed

Some content is hidden

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

229 files changed

+1801
-1512
lines changed

‎RelNotes-1.7.0.txt‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,68 @@ Updates since v1.6.6
7777
the submodule directory when it should (namely, when you are not
7878
interested in the submodule at all and didn't clone/checkout).
7979

80+
* A new attribute conflict-marker-size can be used to change the size of
81+
the conflict markers from the default 7; this is useful when tracked
82+
contents (e.g. git-merge documentation) have strings that resemble the
83+
conflict markers.
84+
8085
* "git checkout A...B" is a way to detach HEAD at the merge base between
8186
A and B.
8287

88+
* "git checkout -m path" to reset the work tree file back into the
89+
conflicted state works even when you already ran "git add path" and
90+
resolved the conflicts.
91+
8392
* "git commit --date='<date>'" can be used to override the author date
8493
just like "git commit --author='<name> <email>'" can be used to
8594
override the author identity.
8695

8796
* "git commit --no-status" can be used to omit the listing of the index
8897
and the work tree status in the editor used to prepare the log message.
8998

99+
* "git commit" warns a bit more aggressively until you configure user.email,
100+
whose default value almost always is not (and fundamentally cannot be)
101+
what you want.
102+
103+
* "git difftool" has been extended to make it easier to integrate it
104+
with gitk.
105+
90106
* "git fetch --all" can now be used in place of "git remote update".
91107

108+
* "git grep" does not rely on external grep anymore.
109+
110+
* "git grep" learned "--no-index" option, to search inside contents that
111+
are not managed by git.
112+
113+
* "git merge" learned to pass options specific to strategy-backends. E.g.
114+
115+
- "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
116+
strategy how much to shift the trees explicitly.
117+
118+
- "git merge -Xtheirs" can be used to auto-merge as much as possible,
119+
while discarding your own changes and taking merged version in
120+
conflicted regions.
121+
92122
* "git push" learned "git push origin --delete branch", a syntactic sugar
93123
for "git push origin :branch".
94124

125+
* "git push" learned "git push --set-upstream origin forker:forkee" that
126+
lets you configure your "forker" branch to later pull from "forkee"
127+
branch at "origin".
128+
95129
* "git rebase --onto A...B" means the history is replayed on top of the
96130
merge base between A and B.
97131

132+
* "git rebase -i" learned new action "fixup", that squashes the change
133+
but does not affect existing log message.
134+
135+
* "git rebase -i" also learned --autosquash option, that is useful
136+
together with the new "fixup" action.
137+
138+
* "git rerere" learned "forget path" subcommand. Together with "git
139+
checkout -m path" it will be useful when you recorded a wrong
140+
resolution.
141+
98142
* Use of "git reset --merge" has become easier when resetting away a
99143
conflicted mess left in the work tree.
100144

@@ -117,6 +161,6 @@ release, unless otherwise noted.
117161

118162
--
119163
exec >/var/tmp/1
120-
O=v1.6.6-263-ge33fd3c
164+
O=v1.6.6.1-379-gd4556c4
121165
echo O=$(git describe master)
122166
git shortlog --no-merges $O..master ^maint

‎cmds-mainporcelain.txt‎

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

9191
linkgit:git-shortlog[1]::
92-
Summarize 'git-log' output.
92+
Summarize 'git log' output.
9393

9494
linkgit:git-show[1]::
9595
Show various types of objects.

‎config.txt‎

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

6969
String values may be entirely or partially enclosed in double quotes.
7070
You need to enclose variable values in double quotes if you want to
@@ -450,8 +450,8 @@ core.pager::
450450

451451
core.whitespace::
452452
A comma separated list of common whitespace problems to
453-
notice. 'git-diff' will use `color.diff.whitespace` to
454-
highlight them, and 'git-apply --whitespace=error' will
453+
notice. 'git diff' will use `color.diff.whitespace` to
454+
highlight them, and 'git apply --whitespace=error' will
455455
consider them as errors. You can prefix `-` to disable
456456
any of them (e.g. `-trailing-space`):
457457
+
@@ -515,7 +515,7 @@ core.sparseCheckout::
515515
linkgit:git-read-tree[1] for more information.
516516

517517
add.ignore-errors::
518-
Tells 'git-add' to continue adding files when some files cannot be
518+
Tells 'git add' to continue adding files when some files cannot be
519519
added due to indexing errors. Equivalent to the '--ignore-errors'
520520
option of linkgit:git-add[1].
521521

@@ -537,19 +537,19 @@ executed from the top-level directory of a repository, which may
537537
not necessarily be the current directory.
538538

539539
apply.ignorewhitespace::
540-
When set to 'change', tells 'git-apply' to ignore changes in
540+
When set to 'change', tells 'git apply' to ignore changes in
541541
whitespace, in the same way as the '--ignore-space-change'
542542
option.
543-
When set to one of: no, none, never, false tells 'git-apply' to
543+
When set to one of: no, none, never, false tells 'git apply' to
544544
respect all whitespace differences.
545545
See linkgit:git-apply[1].
546546

547547
apply.whitespace::
548-
Tells 'git-apply' how to handle whitespaces, in the same way
548+
Tells 'git apply' how to handle whitespaces, in the same way
549549
as the '--whitespace' option. See linkgit:git-apply[1].
550550

551551
branch.autosetupmerge::
552-
Tells 'git-branch' and 'git-checkout' to set up new branches
552+
Tells 'git branch' and 'git checkout' to set up new branches
553553
so that linkgit:git-pull[1] will appropriately merge from the
554554
starting point branch. Note that even if this option is not set,
555555
this behavior can be chosen per-branch using the `--track`
@@ -560,7 +560,7 @@ branch.autosetupmerge::
560560
branch. This option defaults to true.
561561

562562
branch.autosetuprebase::
563-
When a new branch is created with 'git-branch' or 'git-checkout'
563+
When a new branch is created with 'git branch' or 'git checkout'
564564
that tracks another branch, this variable tells git to set
565565
up pull to rebase instead of merge (see "branch.<name>.rebase").
566566
When `never`, rebase is never automatically set to true.
@@ -575,24 +575,24 @@ branch.autosetuprebase::
575575
This option defaults to never.
576576

577577
branch.<name>.remote::
578-
When in branch <name>, it tells 'git-fetch' and 'git-push' which
578+
When in branch <name>, it tells 'git fetch' and 'git push' which
579579
remote to fetch from/push to. It defaults to `origin` if no remote is
580580
configured. `origin` is also used if you are not on any branch.
581581

582582
branch.<name>.merge::
583583
Defines, together with branch.<name>.remote, the upstream branch
584-
for the given branch. It tells 'git-fetch'/'git-pull' which
585-
branch to merge and can also affect 'git-push' (see push.default).
586-
When in branch <name>, it tells 'git-fetch' the default
584+
for the given branch. It tells 'git fetch'/'git pull' which
585+
branch to merge and can also affect 'git push' (see push.default).
586+
When in branch <name>, it tells 'git fetch' the default
587587
refspec to be marked for merging in FETCH_HEAD. The value is
588588
handled like the remote part of a refspec, and must match a
589589
ref which is fetched from the remote given by
590590
"branch.<name>.remote".
591-
The merge information is used by 'git-pull' (which at first calls
592-
'git-fetch') to lookup the default branch for merging. Without
593-
this option, 'git-pull' defaults to merge the first refspec fetched.
591+
The merge information is used by 'git pull' (which at first calls
592+
'git fetch') to lookup the default branch for merging. Without
593+
this option, 'git pull' defaults to merge the first refspec fetched.
594594
Specify multiple values to get an octopus merge.
595-
If you wish to setup 'git-pull' so that it merges into <name> from
595+
If you wish to setup 'git pull' so that it merges into <name> from
596596
another branch in the local repository, you can point
597597
branch.<name>.merge to the desired branch, and use the special setting
598598
`.` (a period) for branch.<name>.remote.
@@ -677,7 +677,7 @@ color.interactive::
677677
colors only when the output is to the terminal. Defaults to false.
678678

679679
color.interactive.<slot>::
680-
Use customized color for 'git-add --interactive'
680+
Use customized color for 'git add --interactive'
681681
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
682682
four distinct types of normal output from interactive
683683
commands. The values of these variables may be specified as
@@ -727,14 +727,14 @@ commit.template::
727727
specified user's home directory.
728728

729729
diff.autorefreshindex::
730-
When using 'git-diff' to compare with work tree
730+
When using 'git diff' to compare with work tree
731731
files, do not consider stat-only change as changed.
732732
Instead, silently run `git update-index --refresh` to
733733
update the cached stat information for paths whose
734734
contents in the work tree match the contents in the
735735
index. This option defaults to true. Note that this
736-
affects only 'git-diff' Porcelain, and not lower level
737-
'diff' commands such as 'git-diff-files'.
736+
affects only 'git diff' Porcelain, and not lower level
737+
'diff' commands such as 'git diff-files'.
738738

739739
diff.external::
740740
If this config variable is set, diff generation is not
@@ -746,24 +746,24 @@ diff.external::
746746
your files, you might want to use linkgit:gitattributes[5] instead.
747747

748748
diff.mnemonicprefix::
749-
If set, 'git-diff' uses a prefix pair that is different from the
749+
If set, 'git diff' uses a prefix pair that is different from the
750750
standard "a/" and "b/" depending on what is being compared. When
751751
this configuration is in effect, reverse diff output also swaps
752752
the order of the prefixes:
753-
'git-diff';;
753+
`git diff`;;
754754
compares the (i)ndex and the (w)ork tree;
755-
'git-diff HEAD';;
755+
`git diff HEAD`;;
756756
compares a (c)ommit and the (w)ork tree;
757-
'git diff --cached';;
757+
`git diff --cached`;;
758758
compares a (c)ommit and the (i)ndex;
759-
'git-diff HEAD:file1 file2';;
759+
`git diff HEAD:file1 file2`;;
760760
compares an (o)bject and a (w)ork tree entity;
761-
'git diff --no-index a b';;
761+
`git diff --no-index a b`;;
762762
compares two non-git things (1) and (2).
763763

764764
diff.renameLimit::
765765
The number of files to consider when performing the copy/rename
766-
detection; equivalent to the 'git-diff' option '-l'.
766+
detection; equivalent to the 'git diff' option '-l'.
767767

768768
diff.renames::
769769
Tells git to detect renames. If set to any boolean value, it
@@ -849,7 +849,7 @@ format.pretty::
849849
linkgit:git-whatchanged[1].
850850

851851
format.thread::
852-
The default threading style for 'git-format-patch'. Can be
852+
The default threading style for 'git format-patch'. Can be
853853
a boolean value, or `shallow` or `deep`. `shallow` threading
854854
makes every mail a reply to the head of the series,
855855
where the head is chosen from the cover letter, the
@@ -867,7 +867,7 @@ format.signoff::
867867

868868
gc.aggressiveWindow::
869869
The window size parameter used in the delta compression
870-
algorithm used by 'git-gc --aggressive'. This defaults
870+
algorithm used by 'git gc --aggressive'. This defaults
871871
to 10.
872872

873873
gc.auto::
@@ -887,33 +887,33 @@ gc.packrefs::
887887
Running `git pack-refs` in a repository renders it
888888
unclonable by Git versions prior to 1.5.1.2 over dumb
889889
transports such as HTTP. This variable determines whether
890-
'git gc' runs `git pack-refs`. This can be set to "nobare"
890+
'git gc' runs `git pack-refs`. This can be set to `nobare`
891891
to enable it within all non-bare repos or it can be set to a
892892
boolean value. The default is `true`.
893893

894894
gc.pruneexpire::
895-
When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
895+
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
896896
Override the grace period with this config variable. The value
897897
"now" may be used to disable this grace period and always prune
898898
unreachable objects immediately.
899899

900900
gc.reflogexpire::
901-
'git-reflog expire' removes reflog entries older than
901+
'git reflog expire' removes reflog entries older than
902902
this time; defaults to 90 days.
903903

904904
gc.reflogexpireunreachable::
905-
'git-reflog expire' removes reflog entries older than
905+
'git reflog expire' removes reflog entries older than
906906
this time and are not reachable from the current tip;
907907
defaults to 30 days.
908908

909909
gc.rerereresolved::
910910
Records of conflicted merge you resolved earlier are
911-
kept for this many days when 'git-rerere gc' is run.
911+
kept for this many days when 'git rerere gc' is run.
912912
The default is 60 days. See linkgit:git-rerere[1].
913913

914914
gc.rerereunresolved::
915915
Records of conflicted merge you have not resolved are
916-
kept for this many days when 'git-rerere gc' is run.
916+
kept for this many days when 'git rerere gc' is run.
917917
The default is 15 days. See linkgit:git-rerere[1].
918918

919919
gitcvs.commitmsgannotation::
@@ -1021,7 +1021,7 @@ gui.spellingdictionary::
10211021
off.
10221022

10231023
gui.fastcopyblame::
1024-
If true, 'git gui blame' uses '-C' instead of '-C -C' for original
1024+
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
10251025
location detection. It makes blame significantly faster on huge
10261026
repositories at the expense of less thorough copy detection.
10271027

@@ -1180,7 +1180,7 @@ i18n.commitEncoding::
11801180

11811181
i18n.logOutputEncoding::
11821182
Character encoding the commit messages are converted to when
1183-
running 'git-log' and friends.
1183+
running 'git log' and friends.
11841184

11851185
imap::
11861186
The configuration variables in the 'imap' section are described
@@ -1214,7 +1214,7 @@ interactive.singlekey::
12141214

12151215
log.date::
12161216
Set default date-time mode for the log command. Setting log.date
1217-
value is similar to using 'git-log'\'s --date option. The value is one of the
1217+
value is similar to using 'git log'\'s --date option. The value is one of the
12181218
following alternatives: {relative,local,default,iso,rfc,short}.
12191219
See linkgit:git-log[1].
12201220

‎fetch-options.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif::git-pull[]
1919

2020
-f::
2121
--force::
22-
When 'git-fetch' is used with `<rbranch>:<lbranch>`
22+
When 'git fetch' is used with `<rbranch>:<lbranch>`
2323
refspec, it refuses to update the local branch
2424
`<lbranch>` unless the remote branch `<rbranch>` it
2525
fetches is a descendant of `<lbranch>`. This option
@@ -61,16 +61,16 @@ endif::git-pull[]
6161

6262
-u::
6363
--update-head-ok::
64-
By default 'git-fetch' refuses to update the head which
64+
By default 'git fetch' refuses to update the head which
6565
corresponds to the current branch. This flag disables the
66-
check. This is purely for the internal use for 'git-pull'
67-
to communicate with 'git-fetch', and unless you are
66+
check. This is purely for the internal use for 'git pull'
67+
to communicate with 'git fetch', and unless you are
6868
implementing your own Porcelain you are not supposed to
6969
use it.
7070

7171
--upload-pack <upload-pack>::
7272
When given, and the repository to fetch from is handled
73-
by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
73+
by 'git fetch-pack', '--exec=<upload-pack>' is passed to
7474
the command to specify non-default path for the command
7575
run on the other end.
7676

‎git-add.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ <h2 id="_description">DESCRIPTION</h2>
348348
ignored files were explicitly specified on the command line, <tt>git add</tt>
349349
will fail with a list of ignored files. Ignored files reached by
350350
directory recursion or filename globbing performed by Git (quote your
351-
globs before the shell) will be silently ignored. The <tt>add</tt> command can
351+
globs before the shell) will be silently ignored. The <em>git add</em> command can
352352
be used to add ignored files with the <tt>-f</tt> (force) option.</p></div>
353353
<div class="para"><p>Please see <a href="git-commit.html">git-commit(1)</a> for alternative ways to add content to a
354354
commit.</p></div>
@@ -721,7 +721,7 @@ <h2 id="_git">GIT</h2>
721721
</div>
722722
<div id="footer">
723723
<div id="footer-text">
724-
Last updated 2010-01-08 07:39:28 UTC
724+
Last updated 2010-01-21 17:44:21 UTC
725725
</div>
726726
</div>
727727
</body>

‎git-add.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The `git add` command will not add ignored files by default. If any
3939
ignored files were explicitly specified on the command line, `git add`
4040
will fail with a list of ignored files. Ignored files reached by
4141
directory recursion or filename globbing performed by Git (quote your
42-
globs before the shell) will be silently ignored. The `add` command can
42+
globs before the shell) will be silently ignored. The 'git add' command can
4343
be used to add ignored files with the `-f` (force) option.
4444

4545
Please see linkgit:git-commit[1] for alternative ways to add content to a

0 commit comments

Comments
 (0)