зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
9fe923886f
Коммит
f61d89e100
|
@ -508,7 +508,7 @@ Bisecting: 3537 revisions left to test after this
|
||||||
|
|
||||||
If you run `git branch` at this point, you'll see that Git has
|
If you run `git branch` at this point, you'll see that Git has
|
||||||
temporarily moved you in "(no branch)". HEAD is now detached from any
|
temporarily moved you in "(no branch)". HEAD is now detached from any
|
||||||
branch and points directly to a commit (with commit id 65934...) that
|
branch and points directly to a commit (with commit id 65934) that
|
||||||
is reachable from "master" but not from v2.6.18. Compile and test it,
|
is reachable from "master" but not from v2.6.18. Compile and test it,
|
||||||
and see whether it crashes. Assume it does crash. Then:
|
and see whether it crashes. Assume it does crash. Then:
|
||||||
|
|
||||||
|
@ -549,14 +549,14 @@ says "bisect". Choose a safe-looking commit nearby, note its commit
|
||||||
id, and check it out with:
|
id, and check it out with:
|
||||||
|
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
$ git reset --hard fb47ddb2db...
|
$ git reset --hard fb47ddb2db
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
|
||||||
then test, run `bisect good` or `bisect bad` as appropriate, and
|
then test, run `bisect good` or `bisect bad` as appropriate, and
|
||||||
continue.
|
continue.
|
||||||
|
|
||||||
Instead of `git bisect visualize` and then `git reset --hard
|
Instead of `git bisect visualize` and then `git reset --hard
|
||||||
fb47ddb2db...`, you might just want to tell Git that you want to skip
|
fb47ddb2db`, you might just want to tell Git that you want to skip
|
||||||
the current commit:
|
the current commit:
|
||||||
|
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
@ -3416,7 +3416,7 @@ commit abc
|
||||||
Author:
|
Author:
|
||||||
Date:
|
Date:
|
||||||
...
|
...
|
||||||
:100644 100644 4b9458b... newsha... M somedirectory/myfile
|
:100644 100644 4b9458b newsha M somedirectory/myfile
|
||||||
|
|
||||||
|
|
||||||
commit xyz
|
commit xyz
|
||||||
|
@ -3424,7 +3424,7 @@ Author:
|
||||||
Date:
|
Date:
|
||||||
|
|
||||||
...
|
...
|
||||||
:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
|
:100644 100644 oldsha 4b9458b M somedirectory/myfile
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
This tells you that the immediately following version of the file was
|
This tells you that the immediately following version of the file was
|
||||||
|
@ -3449,7 +3449,7 @@ and your repository is good again!
|
||||||
$ git log --raw --all
|
$ git log --raw --all
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
and just looked for the sha of the missing object (4b9458b..) in that
|
and just looked for the sha of the missing object (4b9458b) in that
|
||||||
whole thing. It's up to you--Git does *have* a lot of information, it is
|
whole thing. It's up to you--Git does *have* a lot of information, it is
|
||||||
just missing one particular blob version.
|
just missing one particular blob version.
|
||||||
|
|
||||||
|
@ -4114,9 +4114,9 @@ program, e.g. `diff3`, `merge`, or Git's own merge-file, on
|
||||||
the blob objects from these three stages yourself, like this:
|
the blob objects from these three stages yourself, like this:
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$ git cat-file blob 263414f... >hello.c~1
|
$ git cat-file blob 263414f >hello.c~1
|
||||||
$ git cat-file blob 06fa6a2... >hello.c~2
|
$ git cat-file blob 06fa6a2 >hello.c~2
|
||||||
$ git cat-file blob cc44c73... >hello.c~3
|
$ git cat-file blob cc44c73 >hello.c~3
|
||||||
$ git merge-file hello.c~2 hello.c~1 hello.c~3
|
$ git merge-file hello.c~2 hello.c~1 hello.c~3
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
|
@ -4374,7 +4374,7 @@ $ git log --no-merges t/
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
In the pager (`less`), just search for "bundle", go a few lines back,
|
In the pager (`less`), just search for "bundle", go a few lines back,
|
||||||
and see that it is in commit 18449ab0... Now just copy this object name,
|
and see that it is in commit 18449ab0. Now just copy this object name,
|
||||||
and paste it into the command line
|
and paste it into the command line
|
||||||
|
|
||||||
-------------------
|
-------------------
|
||||||
|
|
Загрузка…
Ссылка в новой задаче