Documentation: typos and small fixes in "everyday".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 18, 2005 at 12:11 UTC
d808111ebdb0b50709527612221eb2970ed6ece9
1 file changed
+17
-13
Documentation/everyday.txt
+17
-13
@@ -211,10 +211,12 @@ $ git fetch --tags <8>
211
212
<1> repeat as needed.
213
<2> extract patches from your branch for e-mail submission.
214
-<3> "pull" fetches from "origin" by default and merges.
215
-<4> look at the changes since last time we checked, only in the
214
+<3> "pull" fetches from "origin" by default and merges into the
215
+current branch.
216
+<4> immediately after pulling, look at the changes done upstream
217
+since last time we checked, only in the
218
area we are interested in.
217
-<5> fetch from a specific branch from a specific repository and and merge.
219
+<5> fetch from a specific branch from a specific repository and merge.
220
<6> revert the pull.
221
<7> garbage collect leftover objects from reverted pull.
222
<8> from time to time, obtain official tags from the "origin"
@@ -330,16 +332,18 @@ master, nor exposed as a part of a stable branch.
332
<8> and bundle topic branches still cooking.
333
<9> backport a critical fix.
334
<10> create a signed tag.
333
-<11> make sure I did not accidentally rewound master beyond what I
335
+<11> make sure I did not accidentally rewind master beyond what I
336
already pushed out. "ko" shorthand points at the repository I have
337
at kernel.org, and looks like this:
336
-$ cat .git/remotes/ko
337
-URL: kernel.org:/pub/scm/git/git.git
338
-Pull: master:refs/tags/ko-master
339
-Pull: maint:refs/tags/ko-maint
340
-Push: master
341
-Push: +pu
342
-Push: maint
338
+ $ cat .git/remotes/ko
339
+ URL: kernel.org:/pub/scm/git/git.git
340
+ Pull: master:refs/tags/ko-master
341
+ Pull: maint:refs/tags/ko-maint
342
+ Push: master
343
+ Push: +pu
344
+ Push: maint
345
+In the output from "git show-branch", "master" should have
346
+everything "ko-master" has.
347
<12> push out the bleeding edge.
348
<13> push the tag out, too.
349
------------
@@ -357,8 +361,8 @@ and maintain access to the repository by developers.
361
* gitlink:git-shell[1] can be used as a 'restricted login shell'
362
for shared central repository users.
363
360
- * link:howto/update-hook-example.txt[update hook howto] has a
361
- good example of managing a shared central repository.
364
+link:howto/update-hook-example.txt[update hook howto] has a good
365
+example of managing a shared central repository.
366
367
368
Examples