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>
Elijah Newren committed
Oct 8, 2023 at 06:45 UTC
3771d002571f6fc796ff3f54e9d5b875826e62ed
5 files changed
+5
-5
Documentation/config.txt
+1
-1
@@ -103,7 +103,7 @@ was found. See below for examples.
103
Conditional includes
104
~~~~~~~~~~~~~~~~~~~~
105
106
-You can conditionally include a config file from another by setting a
106
+You can conditionally include a config file from another by setting an
107
`includeIf.<condition>.path` variable to the name of the file to be
108
included.
109
Documentation/diff-generate-patch.txt
+1
-1
@@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted
156
files.
157
+
158
However, if the --combined-all-paths option is provided, instead of a
159
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
159
+two-line from-file/to-file you get an N+1 line from-file/to-file header,
160
where N is the number of parents in the merge commit:
161
162
--- a/file
Documentation/howto/maintain-git.txt
+1
-1
@@ -411,7 +411,7 @@ Preparing a "merge-fix"
411
412
A merge of two topics may not textually conflict but still have
413
conflict at the semantic level. A classic example is for one topic
414
-to rename an variable and all its uses, while another topic adds a
414
+to rename a variable and all its uses, while another topic adds a
415
new use of the variable under its old name. When these two topics
416
are merged together, the reference to the variable newly added by
417
the latter topic will still use the old name in the result.
Documentation/pretty-options.txt
+1
-1
@@ -73,7 +73,7 @@ environment overrides). See linkgit:git-config[1] for more details.
73
With an optional '<ref>' argument, use the ref to find the notes
74
to display. The ref can specify the full refname when it begins
75
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
76
-`refs/notes/` is prefixed to form a full name of the ref.
76
+`refs/notes/` is prefixed to form the full name of the ref.
77
+
78
Multiple --notes options can be combined to control which notes are
79
being displayed. Examples: "--notes=foo" will show only notes from
Documentation/technical/bitmap-format.txt
+1
-1
@@ -126,7 +126,7 @@ Each entry contains the following:
126
** {empty}
127
1-byte XOR-offset: ::
128
The xor offset used to compress this bitmap. For an entry
129
- in position `x`, a XOR offset of `y` means that the actual
129
+ in position `x`, an XOR offset of `y` means that the actual
130
bitmap representing this commit is composed by XORing the
131
bitmap for this entry with the bitmap in entry `x-y` (i.e.
132
the bitmap `y` entries before this one).