aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanti Béjar <santi@agolina.net>2009-02-07 23:21:49 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-08 21:42:17 -0800
commitffe4da1573835806f1c931fc204264f76618aae2 (patch)
tree6b7cae931fa802c9ef2e6c6804f2d6b0487f4f47
parent3ec7371f63046aa6d8e13ddeb1eaa9cccfbf2aa2 (diff)
downloadgit-ffe4da1573835806f1c931fc204264f76618aae2.tar.gz
git-ffe4da1573835806f1c931fc204264f76618aae2.tar.xz
doc/bundle: Use the more conventional suffix '.bundle'
Although it does not matter in general it is handled different by "git clone", as it removes it to make the "humanish" name of the new repository. Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-bundle.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index ea0f6a0f3..57590b148 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -107,17 +107,17 @@ incremental bundle,
----------------
machineA$ cd R1
-machineA$ git bundle create file.bdl master
+machineA$ git bundle create file.bundle master
machineA$ git tag -f lastR2bundle master
----------------
-Then you sneakernet file.bdl to the target machine B. Because you don't
+Then you sneakernet file.bundle to the target machine B. Because you don't
have to have any object to extract objects from such a bundle, not only
you can fetch/pull from a bundle, you can clone from it as if it was a
remote repository.
----------------
-machineB$ git clone /home/me/tmp/file.bdl R2
+machineB$ git clone /home/me/tmp/file.bundle R2
----------------
This will define a remote called "origin" in the resulting repository that
@@ -126,12 +126,12 @@ have an entry like this:
------------------------
[remote "origin"]
- url = /home/me/tmp/file.bdl
+ url = /home/me/tmp/file.bundle
fetch = refs/heads/*:refs/remotes/origin/*
------------------------
You can fetch/pull to update the resulting mine.git repository after
-replacing the bundle you store at /home/me/tmp/file.bdl with incremental
+replacing the bundle you store at /home/me/tmp/file.bundle with incremental
updates from here on.
After working more in the original repository, you can create an
@@ -139,11 +139,11 @@ incremental bundle to update the other:
----------------
machineA$ cd R1
-machineA$ git bundle create file.bdl lastR2bundle..master
+machineA$ git bundle create file.bundle lastR2bundle..master
machineA$ git tag -f lastR2bundle master
----------------
-and sneakernet it to the other machine to replace /home/me/tmp/file.bdl,
+and sneakernet it to the other machine to replace /home/me/tmp/file.bundle,
and pull from it.
----------------