Skip to content

Commit f61d89e

Browse files
bedhangergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9fe9238 commit f61d89e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Documentation/user-manual.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ Bisecting: 3537 revisions left to test after this
508508

509509
If you run `git branch` at this point, you'll see that Git has
510510
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
512512
is reachable from "master" but not from v2.6.18. Compile and test it,
513513
and see whether it crashes. Assume it does crash. Then:
514514

@@ -549,14 +549,14 @@ says "bisect". Choose a safe-looking commit nearby, note its commit
549549
id, and check it out with:
550550

551551
-------------------------------------------------
552-
$ git reset --hard fb47ddb2db...
552+
$ git reset --hard fb47ddb2db
553553
-------------------------------------------------
554554

555555
then test, run `bisect good` or `bisect bad` as appropriate, and
556556
continue.
557557

558558
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
560560
the current commit:
561561

562562
-------------------------------------------------
@@ -3416,15 +3416,15 @@ commit abc
34163416
Author:
34173417
Date:
34183418
...
3419-
:100644 100644 4b9458b... newsha... M somedirectory/myfile
3419+
:100644 100644 4b9458b newsha M somedirectory/myfile
34203420

34213421

34223422
commit xyz
34233423
Author:
34243424
Date:
34253425

34263426
...
3427-
:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
3427+
:100644 100644 oldsha 4b9458b M somedirectory/myfile
34283428
------------------------------------------------
34293429

34303430
This tells you that the immediately following version of the file was
@@ -3449,7 +3449,7 @@ and your repository is good again!
34493449
$ git log --raw --all
34503450
------------------------------------------------
34513451

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
34533453
whole thing. It's up to you--Git does *have* a lot of information, it is
34543454
just missing one particular blob version.
34553455

@@ -4114,9 +4114,9 @@ program, e.g. `diff3`, `merge`, or Git's own merge-file, on
41144114
the blob objects from these three stages yourself, like this:
41154115

41164116
------------------------------------------------
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
41204120
$ git merge-file hello.c~2 hello.c~1 hello.c~3
41214121
------------------------------------------------
41224122

@@ -4374,7 +4374,7 @@ $ git log --no-merges t/
43744374
------------------------
43754375

43764376
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,
43784378
and paste it into the command line
43794379

43804380
-------------------

0 commit comments

Comments
 (0)