Skip to content

Commit ccbb3d1

Browse files
author
Junio C Hamano
committed
Merge branch 'master' into jc/web
* master: (114 commits) gitweb: Fix setting $/ in parse_commit() daemon: do not die on older clients. xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. git-clone: honor --quiet Documentation for the [remote] config prune-packed: Fix uninitialized variable. ignore-errors requires cl git-send-email: do not pass custom Date: header Use column indexes in git-cvsserver where necessary. gitweb: Add '..' (up directory) to tree view if applicable gitweb: Improve git_print_page_path pager: default to LESS=FRSX not LESS=FRS Make prune also run prune-packed git-vc: better installation instructions gitweb: Do not esc_html $basedir argument to git_print_tree_entry gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Fix usagestring for git-branch git-merge: show usage if run without arguments add the capability for index-pack to read from a stream git-clone: define die() and use it. ...
2 parents 63e02a1 + 1259404 commit ccbb3d1

Some content is hidden

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

83 files changed

+2124
-1262
lines changed

‎Documentation/config.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,22 @@ pull.octopus::
230230
pull.twohead::
231231
The default merge strategy to use when pulling a single branch.
232232

233+
remote.<name>.url::
234+
The URL of a remote repository. See gitlink:git-fetch[1] or
235+
gitlink:git-push[1].
236+
237+
remote.<name>.fetch::
238+
The default set of "refspec" for gitlink:git-fetch[1]. See
239+
gitlink:git-fetch[1].
240+
241+
remote.<name>.push::
242+
The default set of "refspec" for gitlink:git-push[1]. See
243+
gitlink:git-push[1].
244+
245+
repack.usedeltabaseoffset::
246+
Allow gitlink:git-repack[1] to create packs that uses
247+
delta-base offset. Defaults to false.
248+
233249
show.difftree::
234250
The default gitlink:git-diff-tree[1] arguments to be used
235251
for gitlink:git-show[1].

‎Documentation/diff-options.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
The width of the filename part can be controlled by
1717
giving another width to it separated by a comma.
1818

19+
--numstat::
20+
Similar to \--stat, but shows number of added and
21+
deleted lines in decimal notation and pathname without
22+
abbreviation, to make it more machine friendly.
23+
1924
--summary::
2025
Output a condensed summary of extended header information
2126
such as creations, renames and mode changes.

‎Documentation/git-cherry-pick.txt‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
77

88
SYNOPSIS
99
--------
10-
'git-cherry-pick' [--edit] [-n] [-r] <commit>
10+
'git-cherry-pick' [--edit] [-n] [-x] <commit>
1111

1212
DESCRIPTION
1313
-----------
@@ -24,13 +24,22 @@ OPTIONS
2424
With this option, `git-cherry-pick` will let you edit the commit
2525
message prior committing.
2626

27-
-r|--replay::
28-
Usually the command appends which commit was
27+
-x::
28+
Cause the command to append which commit was
2929
cherry-picked after the original commit message when
30-
making a commit. This option, '--replay', causes it to
31-
use the original commit message intact. This is useful
32-
when you are reordering the patches in your private tree
33-
before publishing.
30+
making a commit. Do not use this option if you are
31+
cherry-picking from your private branch because the
32+
information is useless to the recipient. If on the
33+
other hand you are cherry-picking between two publicly
34+
visible branches (e.g. backporting a fix to a
35+
maintenance branch for an older release from a
36+
development branch), adding this information can be
37+
useful.
38+
39+
-r|--replay::
40+
It used to be that the command defaulted to do `-x`
41+
described above, and `-r` was to disable it. Now the
42+
default is not to do `-x` so this option is a no-op.
3443

3544
-n|--no-commit::
3645
Usually the command automatically creates a commit with

‎Documentation/git-grep.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SYNOPSIS
1414
[-v | --invert-match] [-h|-H] [--full-name]
1515
[-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]
1616
[-n] [-l | --files-with-matches] [-L | --files-without-match]
17-
[-c | --count]
17+
[-c | --count] [--all-match]
1818
[-A <post-context>] [-B <pre-context>] [-C <context>]
1919
[-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
2020
[<tree>...]
@@ -96,6 +96,11 @@ OPTIONS
9696
higher precedence than `--or`. `-e` has to be used for all
9797
patterns.
9898

99+
--all-match::
100+
When giving multiple pattern expressions combined with `--or`,
101+
this flag is specified to limit the match to files that
102+
have lines to match all of them.
103+
99104
`<tree>...`::
100105
Search blobs in the trees for specified patterns.
101106

@@ -111,6 +116,10 @@ git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \)::
111116
Looks for a line that has `#define` and either `MAX_PATH` or
112117
`PATH_MAX`.
113118

119+
git grep --all-match -e NODE -e Unexpected::
120+
Looks for a line that has `NODE` or `Unexpected` in
121+
files that have lines that match both.
122+
114123
Author
115124
------
116125
Originally written by Linus Torvalds <torvalds@osdl.org>, later

‎Documentation/git-http-push.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ OPTIONS
3434
Report the list of objects being walked locally and the
3535
list of objects successfully sent to the remote repository.
3636

37-
<ref>...:
37+
<ref>...::
3838
The remote refs to update.
3939

4040

‎Documentation/git-pack-objects.txt‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-pack-objects - Create a packed archive of objects
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty]
12+
'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
1313
[--local] [--incremental] [--window=N] [--depth=N]
1414
[--revs [--unpacked | --all]*] [--stdout | base-name] < object-list
1515

@@ -71,11 +71,11 @@ base-name::
7171
--all::
7272
This implies `--revs`. In addition to the list of
7373
revision arguments read from the standard input, pretend
74-
as if all refs under `$GIT_DIR/refs` are specifed to be
74+
as if all refs under `$GIT_DIR/refs` are specified to be
7575
included.
7676

77-
--window and --depth::
78-
These two options affects how the objects contained in
77+
--window=[N], --depth=[N]::
78+
These two options affect how the objects contained in
7979
the pack are stored using delta compression. The
8080
objects are first internally sorted by type, size and
8181
optionally names and compared against the other objects
@@ -84,6 +84,7 @@ base-name::
8484
it too deep affects the performance on the unpacker
8585
side, because delta data needs to be applied that many
8686
times to get to the necessary object.
87+
The default value for both --window and --depth is 10.
8788

8889
--incremental::
8990
This flag causes an object already in a pack ignored
@@ -110,6 +111,17 @@ base-name::
110111
This flag tells the command not to reuse existing deltas
111112
but compute them from scratch.
112113

114+
--delta-base-offset::
115+
A packed archive can express base object of a delta as
116+
either 20-byte object name or as an offset in the
117+
stream, but older version of git does not understand the
118+
latter. By default, git-pack-objects only uses the
119+
former format for better compatibility. This option
120+
allows the command to use the latter format for
121+
compactness. Depending on the average delta chain
122+
length, this option typically shrinks the resulting
123+
packfile by 3-5 per-cent.
124+
113125

114126
Author
115127
------

‎Documentation/git-rebase.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head
77

88
SYNOPSIS
99
--------
10-
'git-rebase' [--merge] [--onto <newbase>] <upstream> [<branch>]
10+
'git-rebase' [-v] [--merge] [--onto <newbase>] <upstream> [<branch>]
1111

1212
'git-rebase' --continue | --skip | --abort
1313

@@ -121,6 +121,9 @@ OPTIONS
121121
is used instead (`git-merge-recursive` when merging a single
122122
head, `git-merge-octopus` otherwise). This implies --merge.
123123

124+
-v, \--verbose::
125+
Display a diffstat of what changed upstream since the last rebase.
126+
124127
include::merge-strategies.txt[]
125128

126129
NOTES

‎Documentation/git-repack.txt‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,28 @@ OPTIONS
5757
`git update-server-info`.
5858

5959
--window=[N], --depth=[N]::
60-
These two options affects how the objects contained in the pack are
60+
These two options affect how the objects contained in the pack are
6161
stored using delta compression. The objects are first internally
6262
sorted by type, size and optionally names and compared against the
6363
other objects within `--window` to see if using delta compression saves
6464
space. `--depth` limits the maximum delta depth; making it too deep
6565
affects the performance on the unpacker side, because delta data needs
6666
to be applied that many times to get to the necessary object.
67+
The default value for both --window and --depth is 10.
68+
69+
70+
Configuration
71+
-------------
72+
73+
When configuration variable `repack.UseDeltaBaseOffset` is set
74+
for the repository, the command passes `--delta-base-offset`
75+
option to `git-pack-objects`; this typically results in slightly
76+
smaller packs, but the generated packs are incompatible with
77+
versions of git older than (and including) v1.4.3; do not set
78+
the variable in a repository that older version of git needs to
79+
be able to read (this includes repositories from which packs can
80+
be copied out over http or rsync, and people who obtained packs
81+
that way can try to use older git with it).
6782

6883

6984
Author

‎Documentation/git-rev-parse.txt‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,19 @@ SPECIFYING REVISIONS
111111

112112
A revision parameter typically, but not necessarily, names a
113113
commit object. They use what is called an 'extended SHA1'
114-
syntax.
114+
syntax. Here are various ways to spell object names. The
115+
ones listed near the end of this list are to name trees and
116+
blobs contained in a commit.
115117

116118
* The full SHA1 object name (40-byte hexadecimal string), or
117119
a substring of such that is unique within the repository.
118120
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
119121
name the same commit object if there are no other object in
120122
your repository whose object name starts with dae86e.
121123

124+
* An output from `git-describe`; i.e. a closest tag, followed by a
125+
dash, a 'g', and an abbreviated object name.
126+
122127
* A symbolic ref name. E.g. 'master' typically means the commit
123128
object referenced by $GIT_DIR/refs/heads/master. If you
124129
happen to have both heads/master and tags/master, you can
@@ -156,6 +161,15 @@ syntax.
156161
and dereference the tag recursively until a non-tag object is
157162
found.
158163

164+
* A suffix ':' followed by a path; this names the blob or tree
165+
at the given path in the tree-ish object named by the part
166+
before the colon.
167+
168+
* A colon, optionally followed by a stage number (0 to 3) and a
169+
colon, followed by a path; this names a blob object in the
170+
index at the given path. Missing stage number (and the colon
171+
that follows it) names an stage 0 entry.
172+
159173
Here is an illustration, by Jon Loeliger. Both node B and C are
160174
a commit parents of commit node A. Parent commits are ordered
161175
left-to-right.

‎Documentation/git-send-pack.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ OPTIONS
4343
<directory>::
4444
The repository to update.
4545

46-
<ref>...:
46+
<ref>...::
4747
The remote refs to update.
4848

4949

0 commit comments

Comments
 (0)