path: root/Documentation
diff options
authorJunio C Hamano <>2007-09-10 18:32:58 (GMT)
committerJunio C Hamano <>2007-09-10 18:32:58 (GMT)
commitddb95de33e99d547c3b533aea12f18c9e4dd649e (patch)
treeb9d745e3dc1cdd91b0bc938ce104808b2f2db42a /Documentation
parent5242bcbb638f031818e9ebd4467c8e55d5a06bfb (diff)
parent6972ab7ae10a205bbc05b98408a36403915a9c39 (diff)
Merge branch 'master' into ph/strbuf
* master: archive - leakfix for format_subst() Make --no-thin the default in git-push to save server resources fix doc for --compression argument to pack-objects git-tag -s must fail if gpg cannot sign the tag. git-svn: understand grafts when doing dcommit git-diff: don't squelch the new SHA1 in submodule diffs Define NO_MEMMEM on Darwin as it lacks the function git-svn: fix "Malformed network data" with svn:// servers (cvs|svn)import: Ask git-tag to overwrite old tags. git-rebase: fix -C option git-rebase: support --whitespace=<option> Documentation / grammer nit archive: rename attribute specfile to export-subst archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2) add memmem() Remove unused function convert_sha1_file() archive: specfile support (--pretty=format: in archive files) Export format_commit_message()
Diffstat (limited to 'Documentation')
4 files changed, 27 insertions, 9 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 227f092..253f4f0 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -68,7 +68,7 @@ OPTIONS
automatically setup .git/objects/info/alternates to
obtain objects from the reference repository. Using
an already existing repository as an alternate will
- require less objects to be copied from the repository
+ require fewer objects to be copied from the repository
being cloned, reducing network and local storage costs.
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 6f17cff..f8a0be3 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -155,12 +155,8 @@ base-name::
generated pack. If not specified, pack compression level is
determined first by pack.compression, then by core.compression,
and defaults to -1, the zlib default, if neither is set.
- Data copied from loose objects will be recompressed
- if core.legacyheaders was true when they were created or if
- the loose compression level (see core.loosecompression and
- core.compression) is now a different value than the pack
- compression level. Add --no-reuse-object if you want to force
- a uniform compression level on all data no matter the source.
+ Add \--no-reuse-object if you want to force a uniform compression
+ level on all data no matter the source.
A packed archive can express base object of a delta as
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 61b1810..0858fa8 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head
-'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
- [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
+'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
+ [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
+ [--onto <newbase>] <upstream> [<branch>]
'git-rebase' --continue | --skip | --abort
@@ -209,6 +210,10 @@ OPTIONS
context exist they all must match. By default no context is
ever ignored.
+ This flag is passed to the `git-apply` program
+ (see gitlink:git-apply[1]) that applies the patch.
-i, \--interactive::
Make a list of the commits which are about to be rebased. Let the
user edit that list before rebasing. This mode can also be used to
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 46f9d59..d0e951e 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -421,6 +421,23 @@ frotz unspecified
+Creating an archive
+If the attribute `export-subst` is set for a file then git will expand
+several placeholders when adding this file to an archive. The
+expansion depends on the availability of a commit ID, i.e. if
+gitlink:git-archive[1] has been given a tree instead of a commit or a
+tag then no replacement will be done. The placeholders are the same
+as those for the option `--pretty=format:` of gitlink:git-log[1],
+except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
+in the file. E.g. the string `$Format:%H$` will be replaced by the
+commit hash.
Part of the gitlink:git[7] suite