mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'maint'
* maint: git-format-patch.txt: fix explanation of an example. git-filter-branch.txt: fix a typo. git-clone.txt: Improve --depth description. gitweb: Update config file example for snapshot feature in gitweb/INSTALL
This commit is contained in:
commit
3e4bb087a1
|
@ -111,11 +111,11 @@ OPTIONS
|
||||||
|
|
||||||
--depth <depth>::
|
--depth <depth>::
|
||||||
Create a 'shallow' clone with a history truncated to the
|
Create a 'shallow' clone with a history truncated to the
|
||||||
specified number of revs. A shallow repository has
|
specified number of revisions. A shallow repository has a
|
||||||
number of limitations (you cannot clone or fetch from
|
number of limitations (you cannot clone or fetch from
|
||||||
it, nor push from nor into it), but is adequate if you
|
it, nor push from nor into it), but is adequate if you
|
||||||
want to only look at near the tip of a large project
|
are only interested in the recent history of a large project
|
||||||
with a long history, and would want to send in a fixes
|
with a long history, and would want to send in fixes
|
||||||
as patches.
|
as patches.
|
||||||
|
|
||||||
<repository>::
|
<repository>::
|
||||||
|
|
|
@ -219,7 +219,7 @@ git filter-branch --commit-filter '
|
||||||
fi' HEAD
|
fi' HEAD
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
The function 'skip_commits' is defined as follows:
|
The function 'skip_commit' is defined as follows:
|
||||||
|
|
||||||
--------------------------
|
--------------------------
|
||||||
skip_commit()
|
skip_commit()
|
||||||
|
|
|
@ -168,7 +168,7 @@ git-format-patch origin::
|
||||||
is created in the current directory.
|
is created in the current directory.
|
||||||
|
|
||||||
git-format-patch \--root origin::
|
git-format-patch \--root origin::
|
||||||
Extract all commits which that leads to 'origin' since the
|
Extract all commits that lead to 'origin' since the
|
||||||
inception of the project.
|
inception of the project.
|
||||||
|
|
||||||
git-format-patch -M -B origin::
|
git-format-patch -M -B origin::
|
||||||
|
|
|
@ -116,7 +116,7 @@ GITWEB_CONFIG file:
|
||||||
$feature{'pickaxe'}{'default'} = [1];
|
$feature{'pickaxe'}{'default'} = [1];
|
||||||
$feature{'pickaxe'}{'override'} = 1;
|
$feature{'pickaxe'}{'override'} = 1;
|
||||||
|
|
||||||
$feature{'snapshot'}{'default'} = ['x-gzip', 'gz', 'gzip'];
|
$feature{'snapshot'}{'default'} = ['zip', 'tgz'];
|
||||||
$feature{'snapshot'}{'override'} = 1;
|
$feature{'snapshot'}{'override'} = 1;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue