Re: [PATCH 1/1] Fix typo in merge-strategies documentation
On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano wrote: > > I somehow had to stare at the patch for a few minutes, view it in > two Emacs buffers and run M-x compare-windows before I finally spot > the single-byte typofix. > > Will queue with a retitle. [resending as plain text] Thanks, and sorry for the confusion. I'll provide a more detailed commit message next time.
[PATCH 0/1] Fix typo in merge-strategies documentation
From: David Pursehouse Fixes a minor typo in the merge-strategies documentation. David Pursehouse (1): Fix typo in merge-strategies documentation Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.2
[PATCH 1/1] Fix typo in merge-strategies documentation
From: David Pursehouse Signed-off-by: David Pursehouse --- Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index fd5d748d1..4a58aad4b 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. theirs;; This is the opposite of 'ours'; note that, unlike 'ours', there is - no 'theirs' merge stragegy to confuse this merge option with. + no 'theirs' merge strategy to confuse this merge option with. patience;; With this option, 'merge-recursive' spends a little extra time -- 2.16.2
[PATCH 1/1] config.txt: Fix formatting of submodule.alternateErrorStrategy section
From: David Pursehouse Add missing `::` after the title. Signed-off-by: David Pursehouse --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 1fee83ca4..6c378c6fc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2894,7 +2894,7 @@ submodule.alternateLocation:: value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate. -submodule.alternateErrorStrategy +submodule.alternateErrorStrategy:: Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`. -- 2.11.1
[PATCH 0/1] config.txt: Fix formatting of submodule.alternateErrorStrategy section
From: David Pursehouse Fixes a minor glitch in the formatting of the documentation. David Pursehouse (1): config.txt: Fix formatting of submodule.alternateErrorStrategy section Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.1
