From: Elijah Newren <newren@xxxxxxxxx> Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- Documentation/ReviewingGuidelines.txt | 2 +- Documentation/git-check-attr.txt | 2 +- Documentation/git-merge-base.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/ReviewingGuidelines.txt b/Documentation/ReviewingGuidelines.txt index 3e98c8a6af0..515d470d23c 100644 --- a/Documentation/ReviewingGuidelines.txt +++ b/Documentation/ReviewingGuidelines.txt @@ -126,7 +126,7 @@ Terminology ----------- nit: :: Denotes a small issue that should be fixed, such as a typographical error - or mis-alignment of conditions in an `if()` statement. + or misalignment of conditions in an `if()` statement. aside: :: optional: :: diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index 6e4f3aaf34c..7fea245ed22 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -29,7 +29,7 @@ OPTIONS --stdin:: Read pathnames from the standard input, one per line, - instead of from the command-line. + instead of from the command line. -z:: The output format is modified to be machine-parsable. diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 463764b9c1e..5cdcb5663cd 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -130,7 +130,7 @@ When the history involves criss-cross merges, there can be more than one ---2---o---o---B .... -both '1' and '2' are merge-bases of A and B. Neither one is better than +both '1' and '2' are merge bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output. -- gitgitgadget
