Skip to content

Commit 39bd2eb

Browse files
gitstergitster
committed
Merge branch 'master' into ph/strbuf
* master: (94 commits) Fixed update-hook example allow-users format. Documentation/git-svn: updated design philosophy notes t/t4014: test "am -3" with mode-only change. git-commit.sh: Shell script cleanup preserve executable bits in zip archives Fix lapsus in builtin-apply.c git-push: documentation and tests for pushing only branches git-svnimport: Use separate arguments in the pipe for git-rev-parse contrib/fast-import: add perl version of simple example contrib/fast-import: add simple shell example rev-list --bisect: Bisection "distance" clean up. rev-list --bisect: Move some bisection code into best_bisection. rev-list --bisect: Move finding bisection into do_find_bisection. Document ls-files --with-tree=<tree-ish> git-commit: partial commit of paths only removed from the index git-commit: Allow partial commit of file removal. send-email: make message-id generation a bit more robust git-apply: fix whitespace stripping git-gui: Disable native platform text selection in "lists" apply --index-info: fall back to current index for mode changes ...
2 parents 68d3025 + 89df580 commit 39bd2eb

Some content is hidden

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

71 files changed

+2677
-1424
lines changed

‎Documentation/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ cmd-list.made: cmd-list.perl $(MAN1_TXT)
123123
perl ./cmd-list.perl
124124
date >$@
125125

126-
git.7 git.html: git.txt core-intro.txt
126+
git.7 git.html: git.txt
127127

128128
clean:
129129
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 *.texi *.texi+ howto-index.txt howto/*.html doc.dep

‎Documentation/config.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,9 +630,17 @@ pack.deltaCacheSize::
630630
A value of 0 means no limit. Defaults to 0.
631631

632632
pack.deltaCacheLimit::
633-
The maxium size of a delta, that is cached in
633+
The maximum size of a delta, that is cached in
634634
gitlink:git-pack-objects[1]. Defaults to 1000.
635635

636+
pack.threads::
637+
Specifies the number of threads to spawn when searching for best
638+
delta matches. This requires that gitlink:git-pack-objects[1]
639+
be compiled with pthreads otherwise this option is ignored with a
640+
warning. This is meant to reduce packing time on multiprocessor
641+
machines. The required amount of memory for the delta search window
642+
is however multiplied by the number of threads.
643+
636644
pull.octopus::
637645
The default merge strategy to use when pulling multiple branches
638646
at once.

‎Documentation/core-intro.txt‎

Lines changed: 0 additions & 592 deletions
This file was deleted.

‎Documentation/core-tutorial.txt‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,24 @@ A git core tutorial for developers
44
Introduction
55
------------
66

7-
This is trying to be a short tutorial on setting up and using a git
8-
repository, mainly because being hands-on and using explicit examples is
9-
often the best way of explaining what is going on.
7+
This tutorial explains how to use the "core" git programs to set up and
8+
work with a git repository.
109

11-
In normal life, most people wouldn't use the "core" git programs
12-
directly, but rather script around them to make them more palatable.
13-
Understanding the core git stuff may help some people get those scripts
14-
done, though, and it may also be instructive in helping people
15-
understand what it is that the higher-level helper scripts are actually
16-
doing.
10+
If you just need to use git as a revision control system you may prefer
11+
to start with link:tutorial.html[a tutorial introduction to git] or
12+
link:user-manual.html[the git user manual].
13+
14+
However, an understanding of these low-level tools can be helpful if
15+
you want to understand git's internals.
1716

1817
The core git is often called "plumbing", with the prettier user
1918
interfaces on top of it called "porcelain". You may not want to use the
2019
plumbing directly very often, but it can be good to know what the
2120
plumbing does for when the porcelain isn't flushing.
2221

23-
The material presented here often goes deep describing how things
24-
work internally. If you are mostly interested in using git as a
25-
SCM, you can skip them during your first pass.
26-
2722
[NOTE]
28-
And those "too deep" descriptions are often marked as Note.
29-
30-
[NOTE]
31-
If you are already familiar with another version control system,
32-
like CVS, you may want to take a look at
33-
link:everyday.html[Everyday GIT in 20 commands or so] first
34-
before reading this.
23+
Deeper technical details are often marked as Notes, which you can
24+
skip on your first reading.
3525

3626

3727
Creating a git repository
@@ -1686,5 +1676,3 @@ merge two at a time, documenting how you resolved the conflicts,
16861676
and the reason why you preferred changes made in one side over
16871677
the other. Otherwise it would make the project history harder
16881678
to follow, not easier.
1689-
1690-
[ to be continued.. cvsimports ]

‎Documentation/git-archive.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ SYNOPSIS
1515
DESCRIPTION
1616
-----------
1717
Creates an archive of the specified format containing the tree
18-
structure for the named tree. If <prefix> is specified it is
18+
structure for the named tree, and writes it out to the standard
19+
output. If <prefix> is specified it is
1920
prepended to the filenames in the archive.
2021

2122
'git-archive' behaves differently when given a tree ID versus when
@@ -31,7 +32,7 @@ OPTIONS
3132
-------
3233

3334
--format=<fmt>::
34-
Format of the resulting archive: 'tar', 'zip'... The default
35+
Format of the resulting archive: 'tar' or 'zip'. The default
3536
is 'tar'.
3637

3738
--list, -l::

‎Documentation/git-config.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ FILES
142142
If not set explicitly with '--file', there are three files where
143143
git-config will search for configuration options:
144144

145-
.git/config::
145+
$GIT_DIR/config::
146146
Repository specific configuration file. (The filename is
147147
of course relative to the repository root, not the working
148148
directory.)

‎Documentation/git-filter-branch.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,6 @@ git filter-branch --commit-filter '
220220
fi' HEAD
221221
------------------------------------------------------------------------------
222222

223-
Note that the changes introduced by the commits, and not reverted by
224-
subsequent commits, will still be in the rewritten branch. If you want
225-
to throw out _changes_ together with the commits, you should use the
226-
interactive mode of gitlink:git-rebase[1].
227-
228223
The function 'skip_commits' is defined as follows:
229224

230225
--------------------------

‎Documentation/git-ls-files.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SYNOPSIS
1515
[-x <pattern>|--exclude=<pattern>]
1616
[-X <file>|--exclude-from=<file>]
1717
[--exclude-per-directory=<file>]
18-
[--error-unmatch]
18+
[--error-unmatch] [--with-tree=<tree-ish>]
1919
[--full-name] [--abbrev] [--] [<file>]\*
2020

2121
DESCRIPTION
@@ -81,6 +81,13 @@ OPTIONS
8181
If any <file> does not appear in the index, treat this as an
8282
error (return 1).
8383

84+
--with-tree=<tree-ish>::
85+
When using --error-unmatch to expand the user supplied
86+
<file> (i.e. path pattern) arguments to paths, pretend
87+
that paths which were removed in the index since the
88+
named <tree-ish> are still present. Using this option
89+
with `-s` or `-u` options does not make any sense.
90+
8491
-t::
8592
Identify the file status with the following tags (followed by
8693
a space) at the start of each line:

‎Documentation/git-pack-objects.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@ base-name::
169169
length, this option typically shrinks the resulting
170170
packfile by 3-5 per-cent.
171171

172+
--threads=<n>::
173+
Specifies the number of threads to spawn when searching for best
174+
delta matches. This requires that pack-objects be compiled with
175+
pthreads otherwise this option is ignored with a warning.
176+
This is meant to reduce packing time on multiprocessor machines.
177+
The required amount of memory for the delta search window is
178+
however multiplied by the number of threads.
179+
172180
--index-version=<version>[,<offset>]::
173181
This is intended to be used by the test suite only. It allows
174182
to force the version for the generated pack index, and to force

‎Documentation/git-push.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ even if it does not result in a fast forward update.
4848
Note: If no explicit refspec is found, (that is neither
4949
on the command line nor in any Push line of the
5050
corresponding remotes file---see below), then all the
51-
refs that exist both on the local side and on the remote
51+
heads that exist both on the local side and on the remote
5252
side are updated.
5353
+
5454
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
@@ -61,7 +61,7 @@ the remote repository.
6161

6262
\--all::
6363
Instead of naming each ref to push, specifies that all
64-
refs be pushed.
64+
refs under `$GIT_DIR/refs/heads/` be pushed.
6565

6666
\--tags::
6767
All refs under `$GIT_DIR/refs/tags` are pushed, in

0 commit comments

Comments
 (0)