diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:04:21 -0700 |
| commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
| tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/howto/maintain-git.txt | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
| download | git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz | |
documentation: wording improvements
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/maintain-git.txt')
| -rw-r--r-- | Documentation/howto/maintain-git.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt index d07c6d44e5..29c473e5e0 100644 --- a/Documentation/howto/maintain-git.txt +++ b/Documentation/howto/maintain-git.txt @@ -104,7 +104,7 @@ by doing the following: files in mbox format). - Write his own patches to address issues raised on the list but - nobody has stepped up solving. Send it out just like other + nobody has stepped up to solve. Send it out just like other contributors do, and pick them up just like patches from other contributors (see above). @@ -417,7 +417,7 @@ are merged together, the reference to the variable newly added by the latter topic will still use the old name in the result. The Meta/Reintegrate script that is used by redo-jch and redo-seen -scripts implements a crude but usable way to work this issue around. +scripts implements a crude but usable way to work around this issue. When the script merges branch $X, it checks if "refs/merge-fix/$X" exists, and if so, the effect of it is squashed into the result of the mechanical merge. In other words, |