From 601f3e57cda1c2d25f08c890f345bc7239802d25 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Feb 2008 08:40:42 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.3-220-g99d8e --- config.txt | 4 +++ git-bundle.html | 77 ++++++++++++++++++++++++++++++++++++++++--------- git-bundle.txt | 44 ++++++++++++++++++++++------ git-config.html | 10 ++++++- 4 files changed, 112 insertions(+), 23 deletions(-) diff --git a/config.txt b/config.txt index 7b676710b..fb6dae0cc 100644 --- a/config.txt +++ b/config.txt @@ -353,6 +353,10 @@ core.whitespace:: error (enabled by default). * `indent-with-non-tab` treats a line that is indented with 8 or more space characters as an error (not enabled by default). +* `cr-at-eol` treats a carriage-return at the end of line as + part of the line terminator, i.e. with it, `trailing-space` + does not trigger if the character before such a carriage-return + is not a whitespace (not enabled by default). alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. diff --git a/git-bundle.html b/git-bundle.html index d01f649df..0c0d4c61d 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -389,31 +389,82 @@ when unpacking at the destination.

Assume two repositories exist as R1 on machine A, and R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc). -We want to update R2 with developments made on branch master in R1. -We set a tag in R1 (lastR2bundle) after the previous such transport, +We want to update R2 with developments made on branch master in R1.

+

To create the bundle you have to specify the basis. You have some options:

+ +
+
+
$ git bundle create mybundle master
+
+ 
$ git-bundle create mybundle master ^lastR2bundle
 $ git tag -f lastR2bundle master
-

(move mybundle from A to B by some mechanism)

-

in R2 on B:

+ +
+
+
$ git bundle create mybundle master ^v1.0.0
+
+ +
+
+
$ git bundle create mybundle master --since=10.days.ago
+
+ +
+
+
$ git bundle create mybundle master -n 10
+
+

Then you move mybundle from A to B, and in R2 on B:

$ git-bundle verify mybundle
-$ git-fetch mybundle  refspec
+$ git-fetch mybundle master:localRef
-

where refspec is refInBundle:localRef

-

Also, with something like this in your config:

-
+

With something like this in the config in R2:

+
-
url = /home/me/tmp/file.bdl
-fetch = refs/heads/*:refs/remotes/origin/*
+
[remote "bundle"]
+    url = /home/me/tmp/file.bdl
+    fetch = refs/heads/*:refs/remotes/origin/*

You can first sneakernet the bundle file to ~/tmp/file.bdl and -then these commands:

+then these commands on machine B:

$ git ls-remote bundle
@@ -433,7 +484,7 @@ network.
diff --git a/git-bundle.txt b/git-bundle.txt index 72f080a97..505ac056e 100644 --- a/git-bundle.txt +++ b/git-bundle.txt @@ -99,36 +99,62 @@ Assume two repositories exist as R1 on machine A, and R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc). We want to update R2 with developments made on branch master in R1. + +To create the bundle you have to specify the basis. You have some options: + +- Without basis. ++ +This is useful when sending the whole history. + +------------ +$ git bundle create mybundle master +------------ + +- Using temporally tags. ++ We set a tag in R1 (lastR2bundle) after the previous such transport, and move it afterwards to help build the bundle. -in R1 on A: - ------------ $ git-bundle create mybundle master ^lastR2bundle $ git tag -f lastR2bundle master ------------ -(move mybundle from A to B by some mechanism) +- Using a tag present in both repositories + +------------ +$ git bundle create mybundle master ^v1.0.0 +------------ + +- A basis based on time. + +------------ +$ git bundle create mybundle master --since=10.days.ago +------------ -in R2 on B: +- With a limit on the number of commits ------------ -$ git-bundle verify mybundle -$ git-fetch mybundle refspec +$ git bundle create mybundle master -n 10 ------------ -where refspec is refInBundle:localRef +Then you move mybundle from A to B, and in R2 on B: +------------ +$ git-bundle verify mybundle +$ git-fetch mybundle master:localRef +------------ -Also, with something like this in your config: +With something like this in the config in R2: +------------------------ [remote "bundle"] url = /home/me/tmp/file.bdl fetch = refs/heads/*:refs/remotes/origin/* +------------------------ You can first sneakernet the bundle file to ~/tmp/file.bdl and -then these commands: +then these commands on machine B: ------------ $ git ls-remote bundle diff --git a/git-config.html b/git-config.html index d4c029bbd..d380da135 100644 --- a/git-config.html +++ b/git-config.html @@ -1160,6 +1160,14 @@ core.whitespace space characters as an error (not enabled by default).

+
  • +

    +cr-at-eol treats a carriage-return at the end of line as + part of the line terminator, i.e. with it, trailing-space + does not trigger if the character before such a carriage-return + is not a whitespace (not enabled by default). +

    +
    • @@ -2278,7 +2286,7 @@ web.browser
    -- 2.26.2