user-manual: rewrap a few long lines
Rewrap some long lines. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
J. Bruce Fields committed
Jan 29, 2007 at 01:33 UTC
1191ee1824aca8f817e531db6b779a11e7fe3c28
1 file changed
+59
-56
Documentation/user-manual.txt
+59
-56
@@ -1377,8 +1377,8 @@ Ensuring reliability
1377
Checking the repository for corruption
1378
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1379
1380
-The gitlink:git-fsck[1] command runs a number of self-consistency
1381
-checks on the repository, and reports on any problems. This may take some
1380
+The gitlink:git-fsck[1] command runs a number of self-consistency checks
1381
+on the repository, and reports on any problems. This may take some
1382
time. The most common warning by far is about "dangling" objects:
1383
1384
-------------------------------------------------
@@ -1394,17 +1394,17 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
1394
...
1395
-------------------------------------------------
1396
1397
-Dangling objects are objects that are harmless, but also unnecessary; you can
1398
-remove them at any time with gitlink:git-prune[1] or the --prune option to
1399
-gitlink:git-gc[1]:
1397
+Dangling objects are objects that are harmless, but also unnecessary;
1398
+you can remove them at any time with gitlink:git-prune[1] or the --prune
1399
+option to gitlink:git-gc[1]:
1400
1401
-------------------------------------------------
1402
$ git gc --prune
1403
-------------------------------------------------
1404
1405
-This may be time-consuming. Unlike most other git operations (including git-gc
1406
-when run without any options), it is not safe to prune while other git
1407
-operations are in progress in the same repository.
1405
+This may be time-consuming. Unlike most other git operations (including
1406
+git-gc when run without any options), it is not safe to prune while
1407
+other git operations are in progress in the same repository.
1408
1409
For more about dangling objects, see <<dangling-objects>>.
1410
@@ -1537,8 +1537,8 @@ repository that you pulled from.
1537
<<fast-forwards,fast forward>>; instead, your branch will just be
1538
updated to point to the latest commit from the upstream branch).
1539
1540
-The git-pull command can also be given "." as the "remote" repository, in
1541
-which case it just merges in a branch from the current repository; so
1540
+The git-pull command can also be given "." as the "remote" repository,
1541
+in which case it just merges in a branch from the current repository; so
1542
the commands
1543
1544
-------------------------------------------------
@@ -2645,13 +2645,13 @@ $ git-cat-file commit <commitname> | head -1
2645
since the tree object information is always the first line in a commit
2646
object.
2647
2648
-Once you know the three trees you are going to merge (the one
2649
-"original" tree, aka the common case, and the two "result" trees, aka
2650
-the branches you want to merge), you do a "merge" read into the
2651
-index. This will complain if it has to throw away your old index contents, so you should
2648
+Once you know the three trees you are going to merge (the one "original"
2649
+tree, aka the common case, and the two "result" trees, aka the branches
2650
+you want to merge), you do a "merge" read into the index. This will
2651
+complain if it has to throw away your old index contents, so you should
2652
make sure that you've committed those - in fact you would normally
2653
-always do a merge against your last commit (which should thus match
2654
-what you have in your current index anyway).
2653
+always do a merge against your last commit (which should thus match what
2654
+you have in your current index anyway).
2655
2656
To do the merge, do
2657
@@ -2801,32 +2801,34 @@ Dangling objects
2801
The gitlink:git-fsck[1] command will sometimes complain about dangling
2802
objects. They are not a problem.
2803
2804
-The most common cause of dangling objects is that you've rebased a branch, or
2805
-you have pulled from somebody else who rebased a branch--see
2806
-<<cleaning-up-history>>. In that case, the old head of the original branch
2807
-still exists, as does obviously everything it pointed to. The branch pointer
2808
-itself just doesn't, since you replaced it with another one.
2809
-
2810
-There are also other situations too that cause dangling objects. For example, a
2811
-"dangling blob" may arise because you did a "git add" of a file, but then,
2812
-before you actually committed it and made it part of the bigger picture, you
2813
-changed something else in that file and committed that *updated* thing - the
2814
-old state that you added originally ends up not being pointed to by any
2815
-commit or tree, so it's now a dangling blob object.
2816
-
2817
-Similarly, when the "recursive" merge strategy runs, and finds that there
2818
-are criss-cross merges and thus more than one merge base (which is fairly
2819
-unusual, but it does happen), it will generate one temporary midway tree
2820
-(or possibly even more, if you had lots of criss-crossing merges and
2821
-more than two merge bases) as a temporary internal merge base, and again,
2822
-those are real objects, but the end result will not end up pointing to
2823
-them, so they end up "dangling" in your repository.
2824
-
2825
-Generally, dangling objects aren't anything to worry about. They can even
2826
-be very useful: if you screw something up, the dangling objects can be how
2827
-you recover your old tree (say, you did a rebase, and realized that you
2828
-really didn't want to - you can look at what dangling objects you have,
2829
-and decide to reset your head to some old dangling state).
2804
+The most common cause of dangling objects is that you've rebased a
2805
+branch, or you have pulled from somebody else who rebased a branch--see
2806
+<<cleaning-up-history>>. In that case, the old head of the original
2807
+branch still exists, as does obviously everything it pointed to. The
2808
+branch pointer itself just doesn't, since you replaced it with another
2809
+one.
2810
+
2811
+There are also other situations too that cause dangling objects. For
2812
+example, a "dangling blob" may arise because you did a "git add" of a
2813
+file, but then, before you actually committed it and made it part of the
2814
+bigger picture, you changed something else in that file and committed
2815
+that *updated* thing - the old state that you added originally ends up
2816
+not being pointed to by any commit or tree, so it's now a dangling blob
2817
+object.
2818
+
2819
+Similarly, when the "recursive" merge strategy runs, and finds that
2820
+there are criss-cross merges and thus more than one merge base (which is
2821
+fairly unusual, but it does happen), it will generate one temporary
2822
+midway tree (or possibly even more, if you had lots of criss-crossing
2823
+merges and more than two merge bases) as a temporary internal merge
2824
+base, and again, those are real objects, but the end result will not end
2825
+up pointing to them, so they end up "dangling" in your repository.
2826
+
2827
+Generally, dangling objects aren't anything to worry about. They can
2828
+even be very useful: if you screw something up, the dangling objects can
2829
+be how you recover your old tree (say, you did a rebase, and realized
2830
+that you really didn't want to - you can look at what dangling objects
2831
+you have, and decide to reset your head to some old dangling state).
2832
2833
For commits, the most useful thing to do with dangling objects tends to
2834
be to do a simple
@@ -2835,23 +2837,24 @@ be to do a simple
2837
$ gitk <dangling-commit-sha-goes-here> --not --all
2838
------------------------------------------------
2839
2838
-For blobs and trees, you can't do the same, but you can examine them. You
2839
-can just do
2840
+For blobs and trees, you can't do the same, but you can examine them.
2841
+You can just do
2842
2843
------------------------------------------------
2844
$ git show <dangling-blob/tree-sha-goes-here>
2845
------------------------------------------------
2846
2845
-to show what the contents of the blob were (or, for a tree, basically what
2846
-the "ls" for that directory was), and that may give you some idea of what
2847
-the operation was that left that dangling object.
2847
+to show what the contents of the blob were (or, for a tree, basically
2848
+what the "ls" for that directory was), and that may give you some idea
2849
+of what the operation was that left that dangling object.
2850
2849
-Usually, dangling blobs and trees aren't very interesting. They're almost
2850
-always the result of either being a half-way mergebase (the blob will
2851
-often even have the conflict markers from a merge in it, if you have had
2852
-conflicting merges that you fixed up by hand), or simply because you
2853
-interrupted a "git fetch" with ^C or something like that, leaving _some_
2854
-of the new objects in the object database, but just dangling and useless.
2851
+Usually, dangling blobs and trees aren't very interesting. They're
2852
+almost always the result of either being a half-way mergebase (the blob
2853
+will often even have the conflict markers from a merge in it, if you
2854
+have had conflicting merges that you fixed up by hand), or simply
2855
+because you interrupted a "git fetch" with ^C or something like that,
2856
+leaving _some_ of the new objects in the object database, but just
2857
+dangling and useless.
2858
2859
Anyway, once you are sure that you're not interested in any dangling
2860
state, you can just prune all unreachable objects:
@@ -2860,9 +2863,9 @@ state, you can just prune all unreachable objects:
2863
$ git prune
2864
------------------------------------------------
2865
2863
-and they'll be gone. But you should only run "git prune" on a quiescent
2864
-repository - it's kind of like doing a filesystem fsck recovery: you don't
2865
-want to do that while the filesystem is mounted.
2866
+and they'll be gone. But you should only run "git prune" on a quiescent
2867
+repository - it's kind of like doing a filesystem fsck recovery: you
2868
+don't want to do that while the filesystem is mounted.
2869
2870
(The same is true of "git-fsck" itself, btw - but since
2871
git-fsck never actually *changes* the repository, it just reports