Documentation: user-manual: limit usage of ellipsis
There is no need to use full 40-hex to identify the object names like the examples hint at by omitting the tail part of an object name as if that has to be spelled out but the example omits them only for brevity. Give examples using abbreviated object names without ellipses just like how people do in real life. Signed-off-by: Ann T Ropea <bedhanger@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ann T Ropea committed
Dec 3, 2017 at 22:27 UTC
f61d89e1009da8025794057ca87c21e277d380fa
1 file changed
+10
-10
Documentation/user-manual.txt
+10
-10
@@ -508,7 +508,7 @@ Bisecting: 3537 revisions left to test after this
508
509
If you run `git branch` at this point, you'll see that Git has
510
temporarily moved you in "(no branch)". HEAD is now detached from any
511
-branch and points directly to a commit (with commit id 65934...) that
511
+branch and points directly to a commit (with commit id 65934) that
512
is reachable from "master" but not from v2.6.18. Compile and test it,
513
and see whether it crashes. Assume it does crash. Then:
514
@@ -549,14 +549,14 @@ says "bisect". Choose a safe-looking commit nearby, note its commit
549
id, and check it out with:
550
551
-------------------------------------------------
552
-$ git reset --hard fb47ddb2db...
552
+$ git reset --hard fb47ddb2db
553
-------------------------------------------------
554
555
then test, run `bisect good` or `bisect bad` as appropriate, and
556
continue.
557
558
Instead of `git bisect visualize` and then `git reset --hard
559
-fb47ddb2db...`, you might just want to tell Git that you want to skip
559
+fb47ddb2db`, you might just want to tell Git that you want to skip
560
the current commit:
561
562
-------------------------------------------------
@@ -3416,7 +3416,7 @@ commit abc
3416
Author:
3417
Date:
3418
...
3419
-:100644 100644 4b9458b... newsha... M somedirectory/myfile
3419
+:100644 100644 4b9458b newsha M somedirectory/myfile
3420
3421
3422
commit xyz
@@ -3424,7 +3424,7 @@ Author:
3424
Date:
3425
3426
...
3427
-:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
3427
+:100644 100644 oldsha 4b9458b M somedirectory/myfile
3428
------------------------------------------------
3429
3430
This tells you that the immediately following version of the file was
@@ -3449,7 +3449,7 @@ and your repository is good again!
3449
$ git log --raw --all
3450
------------------------------------------------
3451
3452
-and just looked for the sha of the missing object (4b9458b..) in that
3452
+and just looked for the sha of the missing object (4b9458b) in that
3453
whole thing. It's up to you--Git does *have* a lot of information, it is
3454
just missing one particular blob version.
3455
@@ -4114,9 +4114,9 @@ program, e.g. `diff3`, `merge`, or Git's own merge-file, on
4114
the blob objects from these three stages yourself, like this:
4115
4116
------------------------------------------------
4117
-$ git cat-file blob 263414f... >hello.c~1
4118
-$ git cat-file blob 06fa6a2... >hello.c~2
4119
-$ git cat-file blob cc44c73... >hello.c~3
4117
+$ git cat-file blob 263414f >hello.c~1
4118
+$ git cat-file blob 06fa6a2 >hello.c~2
4119
+$ git cat-file blob cc44c73 >hello.c~3
4120
$ git merge-file hello.c~2 hello.c~1 hello.c~3
4121
------------------------------------------------
4122
@@ -4374,7 +4374,7 @@ $ git log --no-merges t/
4374
------------------------
4375
4376
In the pager (`less`), just search for "bundle", go a few lines back,
4377
-and see that it is in commit 18449ab0... Now just copy this object name,
4377
+and see that it is in commit 18449ab0. Now just copy this object name,
4378
and paste it into the command line
4379
4380
-------------------