Skip to content

Commit d77ee72

Browse files
author
Junio C Hamano
committed
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible inclusion of "reflog on detached HEAD" series by Nico, as having it in 1.5.0 would really help us remove confusion between detached and attached states. Signed-off-by: Junio C Hamano <junkio@cox.net>
2 parents eb8381c + 8d0fc48 commit d77ee72

File tree

123 files changed

+5106
-923
lines changed

Some content is hidden

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

123 files changed

+5106
-923
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ git-clean
2323
git-clone
2424
git-commit
2525
git-commit-tree
26+
git-config
2627
git-convert-objects
2728
git-count-objects
2829
git-cvsexportcommit
@@ -41,6 +42,7 @@ git-findtags
4142
git-fmt-merge-msg
4243
git-for-each-ref
4344
git-format-patch
45+
git-fsck
4446
git-fsck-objects
4547
git-gc
4648
git-get-tar-commit-id

‎Documentation/Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARTICLES += hooks
1717
ARTICLES += everyday
1818
ARTICLES += git-tools
1919
# with their own formatting rules.
20-
SP_ARTICLES = glossary howto/revert-branch-rebase
20+
SP_ARTICLES = glossary howto/revert-branch-rebase user-manual
2121

2222
DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
2323

@@ -99,6 +99,12 @@ clean:
9999
%.xml : %.txt
100100
asciidoc -b docbook -d manpage -f asciidoc.conf $<
101101

102+
user-manual.xml: user-manual.txt user-manual.conf
103+
asciidoc -b docbook -d book $<
104+
105+
user-manual.html: user-manual.xml
106+
xmlto html-nochunks $<
107+
102108
glossary.html : glossary.txt sort_glossary.pl
103109
cat $< | \
104110
perl sort_glossary.pl | \

‎Documentation/cmd-list.perl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ sub format_one {
9797
git-fmt-merge-msg purehelpers
9898
git-for-each-ref plumbinginterrogators
9999
git-format-patch mainporcelain
100-
git-fsck-objects ancillaryinterrogators
100+
git-fsck ancillaryinterrogators
101101
git-gc mainporcelain
102102
git-get-tar-commit-id ancillaryinterrogators
103103
git-grep mainporcelain
@@ -144,7 +144,7 @@ sub format_one {
144144
git-reflog ancillarymanipulators
145145
git-relink ancillarymanipulators
146146
git-repack ancillarymanipulators
147-
git-repo-config ancillarymanipulators
147+
git-config ancillarymanipulators
148148
git-request-pull foreignscminterface
149149
git-rerere ancillaryinterrogators
150150
git-reset mainporcelain

‎Documentation/config.txt‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ in the section header, like in example below:
3939

4040
Subsection names can contain any characters except newline (doublequote
4141
'`"`' and backslash have to be escaped as '`\"`' and '`\\`',
42-
respecitvely) and are case sensitive. Section header cannot span multiple
42+
respectively) and are case sensitive. Section header cannot span multiple
4343
lines. Variables may belong directly to a section or to a given subsection.
4444
You can have `[section]` if you have `[section "subsection"]`, but you
4545
don't need to.
@@ -62,7 +62,7 @@ The values following the equals sign in variable assign are all either
6262
a string, an integer, or a boolean. Boolean values may be given as yes/no,
6363
0/1 or true/false. Case is not significant in boolean values, when
6464
converting value to the canonical form using '--bool' type specifier;
65-
`git-repo-config` will ensure that the output is "true" or "false".
65+
`git-config` will ensure that the output is "true" or "false".
6666

6767
String values may be entirely or partially enclosed in double quotes.
6868
You need to enclose variable value in double quotes if you want to
@@ -250,23 +250,29 @@ color.branch.<slot>::
250250
Use customized color for branch coloration. `<slot>` is one of
251251
`current` (the current branch), `local` (a local branch),
252252
`remote` (a tracking branch in refs/remotes/), `plain` (other
253-
refs), or `reset` (the normal terminal color). The value for
254-
these configuration variables can be one of: `normal`, `bold`,
255-
`dim`, `ul`, `blink`, `reverse`, `reset`, `black`, `red`,
256-
`green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`.
253+
refs).
254+
+
255+
The value for these configuration variables is a list of colors (at most
256+
two) and attributes (at most one), separated by spaces. The colors
257+
accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
258+
`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
259+
`blink` and `reverse`. The first color given is the foreground; the
260+
second is the background. The position of the attribute, if any,
261+
doesn't matter.
257262

258263
color.diff::
259264
When true (or `always`), always use colors in patch.
260265
When false (or `never`), never. When set to `auto`, use
261266
colors only when the output is to the terminal.
262267

263268
color.diff.<slot>::
264-
Use customized color for diff colorization. `<slot>`
265-
specifies which part of the patch to use the specified
266-
color, and is one of `plain` (context text), `meta`
267-
(metainformation), `frag` (hunk header), `old` (removed
268-
lines), or `new` (added lines). The values of these
269-
variables may be specified as in color.branch.<slot>.
269+
Use customized color for diff colorization. `<slot>` specifies
270+
which part of the patch to use the specified color, and is one
271+
of `plain` (context text), `meta` (metainformation), `frag`
272+
(hunk header), `old` (removed lines), `new` (added lines),
273+
`commit` (commit headers), or `whitespace` (highlighting dubious
274+
whitespace). The values of these variables may be specified as
275+
in color.branch.<slot>.
270276

271277
color.pager::
272278
A boolean to enable/disable colored output when the pager is in

‎Documentation/core-intro.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ size> + <byte\0> + <binary object data>.
8282

8383
The structured objects can further have their structure and
8484
connectivity to other objects verified. This is generally done with
85-
the `git-fsck-objects` program, which generates a full dependency graph
85+
the `git-fsck` program, which generates a full dependency graph
8686
of all objects, and verifies their internal consistency (in addition
8787
to just verifying their superficial consistency through the hash).
8888

‎Documentation/core-tutorial.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ name for the state at that point.
624624
Copying repositories
625625
--------------------
626626

627-
git repositories are normally totally self-sufficient and relocatable
627+
git repositories are normally totally self-sufficient and relocatable.
628628
Unlike CVS, for example, there is no separate notion of
629629
"repository" and "working tree". A git repository normally *is* the
630630
working tree, with the local git information hidden in the `.git`
@@ -1118,7 +1118,7 @@ You could do without using any branches at all, by
11181118
keeping as many local repositories as you would like to have
11191119
branches, and merging between them with `git pull`, just like
11201120
you merge between branches. The advantage of this approach is
1121-
that it lets you keep set of files for each `branch` checked
1121+
that it lets you keep a set of files for each `branch` checked
11221122
out and you may find it easier to switch back and forth if you
11231123
juggle multiple lines of development simultaneously. Of
11241124
course, you will pay the price of more disk usage to hold
@@ -1130,7 +1130,7 @@ the remote repository URL in the local repository's config file
11301130
like this:
11311131

11321132
------------------------------------------------
1133-
$ git repo-config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/
1133+
$ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/
11341134
------------------------------------------------
11351135

11361136
and use the "linus" keyword with `git pull` instead of the full URL.
@@ -1300,7 +1300,7 @@ differences since stage 2 (i.e. your version).
13001300
Publishing your work
13011301
--------------------
13021302

1303-
So we can use somebody else's work from a remote repository; but
1303+
So, we can use somebody else's work from a remote repository, but
13041304
how can *you* prepare a repository to let other people pull from
13051305
it?
13061306

@@ -1469,8 +1469,8 @@ Working with Others
14691469
Although git is a truly distributed system, it is often
14701470
convenient to organize your project with an informal hierarchy
14711471
of developers. Linux kernel development is run this way. There
1472-
is a nice illustration (page 17, "Merges to Mainline") in Randy
1473-
Dunlap's presentation (`http://tinyurl.com/a2jdg`).
1472+
is a nice illustration (page 17, "Merges to Mainline") in
1473+
link:http://tinyurl.com/a2jdg[Randy Dunlap's presentation].
14741474

14751475
It should be stressed that this hierarchy is purely *informal*.
14761476
There is nothing fundamental in git that enforces the "chain of

‎Documentation/cvs-migration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ them first before running git pull.
3636
================================
3737
The `pull` command knows where to get updates from because of certain
3838
configuration variables that were set by the first `git clone`
39-
command; see `git repo-config -l` and the gitlink:git-repo-config[1] man
39+
command; see `git config -l` and the gitlink:git-config[1] man
4040
page for details.
4141
================================
4242

‎Documentation/diff-format.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):
159159
deleted file mode <mode>,<mode>
160160
+
161161
The `mode <mode>,<mode>..<mode>` line appears only if at least one of
162-
the <mode> is diferent from the rest. Extended headers with
162+
the <mode> is different from the rest. Extended headers with
163163
information about detected contents movement (renames and
164164
copying detection) are designed to work with diff of two
165165
<tree-ish> and are not used by combined diff format.

0 commit comments

Comments
 (0)