diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-01 21:58:53 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-01 21:58:53 -0800 |
commit | 235d521da60e4699e5bd59ac658b5b48bd76ddca (patch) | |
tree | 25620311ca206d41659b5f3e6f60760dca584c2b /Documentation/tutorial.txt | |
parent | Merge branch 'fixes' (diff) | |
parent | Add -P to the documentation head. (diff) | |
download | tgif-235d521da60e4699e5bd59ac658b5b48bd76ddca.tar.xz |
GIT 0.99.9b
This contains the changes made on the master branch since 0.99.9a.
The workaround for building RPMs has not changed since 0.99.9a,
mainly because I haven't heard back if it was good enough for
kernel.org consumption, or otherwise what changes are needed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
-rw-r--r-- | Documentation/tutorial.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index b9f737e964..20a4cb1df4 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -1028,7 +1028,9 @@ multiple working trees, but disk space is cheap these days. [NOTE] You could even pull from your own repository by -giving '.' as <remote-repository> parameter to `git pull`. +giving '.' as <remote-repository> parameter to `git pull`. This +is useful when you want to merge a local branch (or more, if you +are making an Octopus) into the current branch. It is likely that you will be pulling from the same remote repository from time to time. As a short hand, you can store |