mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
documentation: fix choice of article
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
03b3431e6a
commit
3771d00257
5 changed files with 5 additions and 5 deletions
|
@ -103,7 +103,7 @@ was found. See below for examples.
|
||||||
Conditional includes
|
Conditional includes
|
||||||
~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
You can conditionally include a config file from another by setting a
|
You can conditionally include a config file from another by setting an
|
||||||
`includeIf.<condition>.path` variable to the name of the file to be
|
`includeIf.<condition>.path` variable to the name of the file to be
|
||||||
included.
|
included.
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted
|
||||||
files.
|
files.
|
||||||
+
|
+
|
||||||
However, if the --combined-all-paths option is provided, instead of a
|
However, if the --combined-all-paths option is provided, instead of a
|
||||||
two-line from-file/to-file you get a N+1 line from-file/to-file header,
|
two-line from-file/to-file you get an N+1 line from-file/to-file header,
|
||||||
where N is the number of parents in the merge commit:
|
where N is the number of parents in the merge commit:
|
||||||
|
|
||||||
--- a/file
|
--- a/file
|
||||||
|
|
|
@ -411,7 +411,7 @@ Preparing a "merge-fix"
|
||||||
|
|
||||||
A merge of two topics may not textually conflict but still have
|
A merge of two topics may not textually conflict but still have
|
||||||
conflict at the semantic level. A classic example is for one topic
|
conflict at the semantic level. A classic example is for one topic
|
||||||
to rename an variable and all its uses, while another topic adds a
|
to rename a variable and all its uses, while another topic adds a
|
||||||
new use of the variable under its old name. When these two topics
|
new use of the variable under its old name. When these two topics
|
||||||
are merged together, the reference to the variable newly added by
|
are merged together, the reference to the variable newly added by
|
||||||
the latter topic will still use the old name in the result.
|
the latter topic will still use the old name in the result.
|
||||||
|
|
|
@ -73,7 +73,7 @@ environment overrides). See linkgit:git-config[1] for more details.
|
||||||
With an optional '<ref>' argument, use the ref to find the notes
|
With an optional '<ref>' argument, use the ref to find the notes
|
||||||
to display. The ref can specify the full refname when it begins
|
to display. The ref can specify the full refname when it begins
|
||||||
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
|
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
|
||||||
`refs/notes/` is prefixed to form a full name of the ref.
|
`refs/notes/` is prefixed to form the full name of the ref.
|
||||||
+
|
+
|
||||||
Multiple --notes options can be combined to control which notes are
|
Multiple --notes options can be combined to control which notes are
|
||||||
being displayed. Examples: "--notes=foo" will show only notes from
|
being displayed. Examples: "--notes=foo" will show only notes from
|
||||||
|
|
|
@ -126,7 +126,7 @@ Each entry contains the following:
|
||||||
** {empty}
|
** {empty}
|
||||||
1-byte XOR-offset: ::
|
1-byte XOR-offset: ::
|
||||||
The xor offset used to compress this bitmap. For an entry
|
The xor offset used to compress this bitmap. For an entry
|
||||||
in position `x`, a XOR offset of `y` means that the actual
|
in position `x`, an XOR offset of `y` means that the actual
|
||||||
bitmap representing this commit is composed by XORing the
|
bitmap representing this commit is composed by XORing the
|
||||||
bitmap for this entry with the bitmap in entry `x-y` (i.e.
|
bitmap for this entry with the bitmap in entry `x-y` (i.e.
|
||||||
the bitmap `y` entries before this one).
|
the bitmap `y` entries before this one).
|
||||||
|
|
Loading…
Reference in a new issue