From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Sep 2024 18:02:19 +0000 (-0700)
Subject: Merge branch 'jc/grammo-fixes' into maint-2.46
X-Git-Tag: v2.46.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2b936f1dc1a48e6fbe43aabcdf66fb06e648c1a;p=thirdparty%2Fgit.git

Merge branch 'jc/grammo-fixes' into maint-2.46

Doc updates.

* jc/grammo-fixes:
  doc: grammofix in git-diff-tree
  tutorial: grammofix
---

d2b936f1dc1a48e6fbe43aabcdf66fb06e648c1a
diff --cc Documentation/gittutorial.txt
index 4759408788,8b5b15ce05..f89ad30cf6
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@@ -360,8 -361,8 +360,8 @@@ $ gitk HEAD...FETCH_HEA
  This means "show everything that is reachable from either one, but
  exclude anything that is reachable from both of them".
  
- Please note that these range notation can be used with both `gitk`
 -Please note that these range notations can be used with both gitk
 -and "git log".
++Please note that these range notations can be used with both `gitk`
 +and `git log`.
  
  After inspecting what Bob did, if there is nothing urgent, Alice may
  decide to continue working without pulling from Bob.  If Bob's history