From 5478285961996560147e2fd39daf45b79f580641 Mon Sep 17 00:00:00 2001 From: Andy Parkins Date: Tue, 12 Jun 2007 16:43:19 +0100 Subject: user-manual: grammar and style fixes - "method of" is vulgar, "method for" is nicer - "recovery" becomes "recovering" from Steve Hoelzer's original version of this patch - "if you want" is nicer as "if you wish" - "you may" should be "you can"; "you may" is "you have permission to" rather than "you can"'s "it is possible to" Signed-off-by: Andy Parkins Signed-off-by: "J. Bruce Fields" diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 714e6a9..e9da591 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1528,9 +1528,9 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f ------------------------------------------------- Dangling objects are not a problem. At worst they may take up a little -extra disk space. They can sometimes provide a last-resort method of -recovery lost work--see <> for details. However, if -you want, you may remove them with gitlink:git-prune[1] or the --prune +extra disk space. They can sometimes provide a last-resort method for +recovering lost work--see <> for details. However, if +you wish, you can remove them with gitlink:git-prune[1] or the --prune option to gitlink:git-gc[1]: ------------------------------------------------- -- cgit v0.10.2-6-g49f6 From f0dc409c31c430e5a5e45161383fba7964b4044d Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 21 Jun 2007 23:17:40 -0400 Subject: tutorial: Fix typo "You" should be "Alice" here. Signed-off-by: "J. Bruce Fields" diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 118ff72..965ec00 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -304,7 +304,7 @@ it easier: $ git remote add bob /home/bob/myrepo ------------------------------------------------ -With this, you can perform the first operation alone using the +With this, Alice can perform the first operation alone using the "git fetch" command without merging them with her own branch, using: -- cgit v0.10.2-6-g49f6 From 11d515334432e840d9699703e0634e9df58a4441 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 18 Jun 2007 16:38:22 -0400 Subject: user-manual: more explanation of push and pull usage Recently a user on the mailing list complained that they'd read the manual but couldn't figure out how to keep a couple private repositories in sync. They'd tried using push, and were surprised by the effect. Add a little text in an attempt to make it clear that: - Pushing to a branch that is checked out will have odd results. - It's OK to synchronize just using pull if that's simpler. Signed-off-by: "J. Bruce Fields" diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index e9da591..2aed7eb 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1772,7 +1772,7 @@ repository, but it works just as well in the other direction. If you and the maintainer both have accounts on the same machine, then you can just pull changes from each other's repositories directly; -commands that accepts repository URLs as arguments will also accept a +commands that accept repository URLs as arguments will also accept a local directory name: ------------------------------------------------- @@ -1780,6 +1780,15 @@ $ git clone /path/to/repository $ git pull /path/to/other/repository ------------------------------------------------- +or an ssh url: + +------------------------------------------------- +$ git clone ssh://yourhost/~you/repository +------------------------------------------------- + +For projects with few developers, or for synchronizing a few private +repositories, this may be all you need. + However, the more common way to do this is to maintain a separate public repository (usually on a different host) for others to pull changes from. This is usually more convenient, and allows you to cleanly @@ -1802,6 +1811,8 @@ like this: | they push V their public repo <------------------- their repo +We explain how to do this in the following sections. + [[setting-up-a-public-repository]] Setting up a public repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1913,6 +1924,12 @@ proceeding the branch name by a plus sign: $ git push ssh://yourserver.com/~you/proj.git +master ------------------------------------------------- +Note that the target of a "push" is normally a +<> repository. You can also push to a +repository that has a checked-out working tree, but the working tree +will not be updated by the push. This may lead to unexpected results if +the branch you push to is the currently checked-out branch! + As with git-fetch, you may also set up configuration options to save typing; so, for example, after -- cgit v0.10.2-6-g49f6 From ccd71866b0c7253f988c4836eeb888e4abcc2da1 Mon Sep 17 00:00:00 2001 From: William Pursell Date: Fri, 29 Jun 2007 14:08:29 +0100 Subject: user-manual: fix directory name in git-archive example Signed-off-by: "J. Bruce Fields" diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 2aed7eb..d6caff4 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -890,7 +890,7 @@ $ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz ------------------------------------------------- will use HEAD to produce a tar archive in which each filename is -preceded by "prefix/". +preceded by "project/". If you're releasing a new version of a software project, you may want to simultaneously make a changelog to include in the release -- cgit v0.10.2-6-g49f6