undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/doc-bundle'

Browse Source 
* mg/doc-bundle:
  git-bundle.txt: Clarify rev-list-args restrictions
  git-bundle.txt: whitespace cleanup
  git-bundle.txt: Cleanup

Conflicts:
	Documentation/git-bundle.txt
This commit is contained in:
Junio C Hamano 2010-09-03 09:43:42 -07:00
commit b9f171cc3b
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/git-bundle.txt
View File

@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git bundle' create <file> <git-rev-list args> 'git bundle' create <file> <git-rev-list-args>
'git bundle' verify <file> 'git bundle' verify <file>
'git bundle' list-heads <file> [refname...] 'git bundle' list-heads <file> [refname...]
'git bundle' unbundle <file> [refname...] 'git bundle' unbundle <file> [refname...]
@ -35,7 +35,7 @@ OPTIONS
create <file>:: create <file>::
Used to create a bundle named 'file'. This requires the Used to create a bundle named 'file'. This requires the
'git rev-list' arguments to define the bundle contents. 'git-rev-list-args' arguments to define the bundle contents.
verify <file>:: verify <file>::
Used to check that a bundle file is valid and will apply Used to check that a bundle file is valid and will apply
@ -57,10 +57,11 @@ unbundle <file>::
references matching those in the list are printed. This command is references matching those in the list are printed. This command is
really plumbing, intended to be called only by 'git fetch'. really plumbing, intended to be called only by 'git fetch'.
[git-rev-list-args...]:: <git-rev-list-args>::
A list of arguments, acceptable to 'git rev-parse' and A list of arguments, acceptable to 'git rev-parse' and
'git rev-list', that specifies the specific objects and references 'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES
to transport. For example, `master~10..master` causes the below), that specifies the specific objects and references
to transport. For example, `master{tilde}10..master` causes the
current master reference to be packaged along with all objects current master reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be limit to the number of references and objects that may be
@ -154,7 +155,7 @@ machineB$ git pull
If you know up to what commit the intended recipient repository should If you know up to what commit the intended recipient repository should
have the necessary objects, you can use that knowledge to specify the have the necessary objects, you can use that knowledge to specify the
basis, giving a cut-off point to limit the revisions and objects that go basis, giving a cut-off point to limit the revisions and objects that go
in the resulting bundle. The previous example used lastR2bundle tag in the resulting bundle. The previous example used the lastR2bundle tag
for this purpose, but you can use any other options that you would give to for this purpose, but you can use any other options that you would give to
the linkgit:git-log[1] command. Here are more examples: the linkgit:git-log[1] command. Here are more examples:
@ -194,7 +195,7 @@ references when fetching:
$ git fetch mybundle master:localRef $ git fetch mybundle master:localRef
---------------- ----------------
You can also see what references it offers. You can also see what references it offers:
---------------- ----------------
$ git ls-remote mybundle $ git ls-remote mybundle