From d2d9ae15e2c76f17c5870205b390354b509d0d97 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 19 Sep 2007 02:27:57 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.1-153-g89df5 --- git-push.html | 6 +++--- git-push.txt | 4 ++-- git-send-pack.html | 6 +++--- git-send-pack.txt | 4 ++-- git-svn.html | 13 +++++++------ git-svn.txt | 11 ++++++----- howto-index.html | 2 +- howto/update-hook-example.txt | 8 ++++---- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/git-push.html b/git-push.html index 9752e91af..dacd37547 100644 --- a/git-push.html +++ b/git-push.html @@ -317,7 +317,7 @@ even if it does not result in a fast forward update.

Note: If no explicit refspec is found, (that is neither on the command line nor in any Push line of the corresponding remotes file---see below), then all the -refs that exist both on the local side and on the remote +heads that exist both on the local side and on the remote side are updated.

tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>.

A parameter <ref> without a colon pushes the <ref> from the source @@ -331,7 +331,7 @@ the remote repository.

Instead of naming each ref to push, specifies that all - refs be pushed. + refs under $GIT_DIR/refs/heads/ be pushed.

@@ -613,7 +613,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-push.txt b/git-push.txt index 7b8e075c4..6bc559ddd 100644 --- a/git-push.txt +++ b/git-push.txt @@ -48,7 +48,7 @@ even if it does not result in a fast forward update. Note: If no explicit refspec is found, (that is neither on the command line nor in any Push line of the corresponding remotes file---see below), then all the -refs that exist both on the local side and on the remote +heads that exist both on the local side and on the remote side are updated. + `tag ` means the same as `refs/tags/:refs/tags/`. @@ -61,7 +61,7 @@ the remote repository. \--all:: Instead of naming each ref to push, specifies that all - refs be pushed. + refs under `$GIT_DIR/refs/heads/` be pushed. \--tags:: All refs under `$GIT_DIR/refs/tags` are pushed, in diff --git a/git-send-pack.html b/git-send-pack.html index f9b228fe3..de616709b 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -309,7 +309,7 @@ updates it from the current repository, sending named refs.

Instead of explicitly specifying which refs to update, - update all refs that locally exist. + update all heads that locally exist.

@@ -376,7 +376,7 @@ remote end.

With --all flag, all refs that exist locally are transferred to the remote side. You cannot specify any <ref> if you use this flag.

-

Without --all and without any <ref>, the refs that exist +

Without --all and without any <ref>, the heads that exist both on the local side and on the remote side are updated.

When one or more <ref> are specified explicitly, it can be either a single pattern, or a pair of such pattern separated by a colon @@ -443,7 +443,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index 205bfd2d2..3271e8818 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -32,7 +32,7 @@ OPTIONS \--all:: Instead of explicitly specifying which refs to update, - update all refs that locally exist. + update all heads that locally exist. \--force:: Usually, the command refuses to update a remote ref that @@ -70,7 +70,7 @@ With '--all' flag, all refs that exist locally are transferred to the remote side. You cannot specify any '' if you use this flag. -Without '--all' and without any '', the refs that exist +Without '--all' and without any '', the heads that exist both on the local side and on the remote side are updated. When one or more '' are specified explicitly, it can be either a diff --git a/git-svn.html b/git-svn.html index b7eb7dcd3..ba0872d87 100644 --- a/git-svn.html +++ b/git-svn.html @@ -976,11 +976,12 @@ previous commits in SVN.

DESIGN PHILOSOPHY

Merge tracking in Subversion is lacking and doing branched development -with Subversion is cumbersome as a result. git-svn does not do -automated merge/branch tracking by default and leaves it entirely up to -the user on the git side. git-svn does however follow copy -history of the directory that it is tracking, however (much like -how svn log works).

+with Subversion can be cumbersome as a result. While git-svn can track +copy history (including branches and tags) for repositories adopting a +standard layout, it cannot yet represent merge history that happened +inside git back upstream to SVN users. Therefore it is advised that +users keep history as linear as possible inside git to ease +compatibility with SVN (see the CAVEATS section below).

CAVEATS

@@ -1059,7 +1060,7 @@ should be manually entered with a text-editor or using
diff --git a/git-svn.txt b/git-svn.txt index be2e34eb8..e157c6ab5 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -478,11 +478,12 @@ previous commits in SVN. DESIGN PHILOSOPHY ----------------- Merge tracking in Subversion is lacking and doing branched development -with Subversion is cumbersome as a result. git-svn does not do -automated merge/branch tracking by default and leaves it entirely up to -the user on the git side. git-svn does however follow copy -history of the directory that it is tracking, however (much like -how 'svn log' works). +with Subversion can be cumbersome as a result. While git-svn can track +copy history (including branches and tags) for repositories adopting a +standard layout, it cannot yet represent merge history that happened +inside git back upstream to SVN users. Therefore it is advised that +users keep history as linear as possible inside git to ease +compatibility with SVN (see the CAVEATS section below). CAVEATS ------- diff --git a/howto-index.html b/howto-index.html index 82d6b3c77..465e10182 100644 --- a/howto-index.html +++ b/howto-index.html @@ -341,7 +341,7 @@ into which branch and who can make a tag.

diff --git a/howto/update-hook-example.txt b/howto/update-hook-example.txt index 3a33696f0..88765b557 100644 --- a/howto/update-hook-example.txt +++ b/howto/update-hook-example.txt @@ -158,11 +158,11 @@ This uses two files, $GIT_DIR/info/allowed-users and allowed-groups, to describe which heads can be pushed into by whom. The format of each file would look like this: - refs/heads/master junio + refs/heads/master junio refs/heads/cogito$ pasky - refs/heads/bw/ linus - refs/heads/tmp/ * - refs/tags/v[0-9]* junio + refs/heads/bw/.* linus + refs/heads/tmp/.* .* + refs/tags/v[0-9].* junio With this, Linus can push or create "bw/penguin" or "bw/zebra" or "bw/panda" branches, Pasky can do only "cogito", and JC can -- 2.26.2