Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43
Doc updates. * jc/doc-most-refs-are-not-that-special: docs: MERGE_AUTOSTASH is not that special docs: AUTO_MERGE is not that special refs.h: HEAD is not that special git-bisect.txt: BISECT_HEAD is not that special git.txt: HEAD is not that specialmaint
commit
79f79e58a4
|
@ -362,7 +362,7 @@ OPTIONS
|
|||
--no-checkout::
|
||||
+
|
||||
Do not checkout the new working tree at each iteration of the bisection
|
||||
process. Instead just update a special reference named `BISECT_HEAD` to make
|
||||
process. Instead just update the reference named `BISECT_HEAD` to make
|
||||
it point to the commit that should be tested.
|
||||
+
|
||||
This option may be useful when the test you would perform in each step
|
||||
|
|
|
@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be
|
|||
noted that all of the <commit> in the above description, except
|
||||
in the `--merge-base` case and in the last two forms that use `..`
|
||||
notations, can be any <tree>. A tree of interest is the one pointed to
|
||||
by the special ref `AUTO_MERGE`, which is written by the 'ort' merge
|
||||
by the ref named `AUTO_MERGE`, which is written by the 'ort' merge
|
||||
strategy upon hitting merge conflicts (see linkgit:git-merge[1]).
|
||||
Comparing the working tree with `AUTO_MERGE` shows changes you've made
|
||||
so far to resolve textual conflicts (see the examples below).
|
||||
|
|
|
@ -196,7 +196,7 @@ happens:
|
|||
can inspect the stages with `git ls-files -u`). The working
|
||||
tree files contain the result of the merge operation; i.e. 3-way
|
||||
merge results with familiar conflict markers `<<<` `===` `>>>`.
|
||||
5. A special ref `AUTO_MERGE` is written, pointing to a tree
|
||||
5. A ref named `AUTO_MERGE` is written, pointing to a tree
|
||||
corresponding to the current content of the working tree (including
|
||||
conflict markers for textual conflicts). Note that this ref is only
|
||||
written when the 'ort' merge strategy is used (the default).
|
||||
|
|
|
@ -1024,10 +1024,11 @@ When first created, objects are stored in individual files, but for
|
|||
efficiency may later be compressed together into "pack files".
|
||||
|
||||
Named pointers called refs mark interesting points in history. A ref
|
||||
may contain the SHA-1 name of an object or the name of another ref. Refs
|
||||
with names beginning `ref/head/` contain the SHA-1 name of the most
|
||||
may contain the SHA-1 name of an object or the name of another ref (the
|
||||
latter is called a "symbolic ref").
|
||||
Refs with names beginning `refs/head/` contain the SHA-1 name of the most
|
||||
recent commit (or "head") of a branch under development. SHA-1 names of
|
||||
tags of interest are stored under `ref/tags/`. A special ref named
|
||||
tags of interest are stored under `refs/tags/`. A symbolic ref named
|
||||
`HEAD` contains the name of the currently checked-out branch.
|
||||
|
||||
The index file is initialized with a list of all paths and, for each
|
||||
|
|
|
@ -191,7 +191,7 @@ endif::git-pull[]
|
|||
--autostash::
|
||||
--no-autostash::
|
||||
Automatically create a temporary stash entry before the operation
|
||||
begins, record it in the special ref `MERGE_AUTOSTASH`
|
||||
begins, record it in the ref `MERGE_AUTOSTASH`
|
||||
and apply it after the operation ends. This means
|
||||
that you can run the operation on a dirty worktree. However, use
|
||||
with care: the final stash application after a successful
|
||||
|
|
|
@ -1344,7 +1344,7 @@ $ git diff --theirs file.txt # same as the above.
|
|||
-------------------------------------------------
|
||||
|
||||
When using the 'ort' merge strategy (the default), before updating the working
|
||||
tree with the result of the merge, Git writes a special ref named AUTO_MERGE
|
||||
tree with the result of the merge, Git writes a ref named AUTO_MERGE
|
||||
reflecting the state of the tree it is about to write. Conflicted paths with
|
||||
textual conflicts that could not be automatically merged are written to this
|
||||
tree with conflict markers, just as in the working tree. AUTO_MERGE can thus be
|
||||
|
|
2
refs.h
2
refs.h
|
@ -56,7 +56,7 @@ struct worktree;
|
|||
* Even with RESOLVE_REF_ALLOW_BAD_NAME, names that escape the refs/
|
||||
* directory and do not consist of all caps and underscores cannot be
|
||||
* resolved. The function returns NULL for such ref names.
|
||||
* Caps and underscores refers to the special refs, such as HEAD,
|
||||
* Caps and underscores refers to the pseudorefs, such as HEAD,
|
||||
* FETCH_HEAD and friends, that all live outside of the refs/ directory.
|
||||
*/
|
||||
#define RESOLVE_REF_READING 0x01
|
||||
|
|
Loading…
Reference in New Issue