From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:06 +0000 (-0800)
Subject: Merge branch 'ms/non-ascii-ticks'
X-Git-Tag: v2.17.0-rc0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/327e524d6620abb39bca3e7579a871b9b60b397d

Merge branch 'ms/non-ascii-ticks'

Doc markup fix.

* ms/non-ascii-ticks:
Documentation/gitsubmodules.txt: avoid non-ASCII apostrophes
---

327e524d6620abb39bca3e7579a871b9b60b397d
diff --cc Documentation/gitsubmodules.txt
index 4d6c17782f,030c974c25..3b9faabdbb
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@@ -33,11 -33,11 +33,11 @@@ in its `.gitmodules` file (see linkgit:
  `submodule.foo.path = path/to/bar`.
  
  The `gitlink` entry contains the object name of the commit that the
- superproject expects the submodule’s working directory to be at.
+ superproject expects the submodule's working directory to be at.
  
  The section `submodule.foo.*` in the `.gitmodules` file gives additional
 -hints to Gits porcelain layer such as where to obtain the submodule via
 -the `submodule.foo.url` setting.
 +hints to Git's porcelain layer. For example, the `submodule.foo.url`
 +setting specifies where to obtain the submodule.
  
  Submodules can be used for at least two different use cases:
  
@@@ -141,8 -137,8 +141,8 @@@ directory is automatically moved to `$G
  of the superproject.
  
   * Deinitialized submodule: A `gitlink`, and a `.gitmodules` entry,
- but no submodule working directory. The submodule’s Git directory
 -but no submodule working directory. The submodule's git directory
 -may be there as after deinitializing the git directory is kept around.
++but no submodule working directory. The submodule's Git directory
 +may be there as after deinitializing the Git directory is kept around.
  The directory which is supposed to be the working directory is empty instead.
  +
  A submodule can be deinitialized by running `git submodule deinit`.