4d542687fc · matheusbsbs/matheus-bagliano

Documentation/ToolsForGit.txt

+1 -1

@@ -5,7 +5,7 @@ Tools for developing Git

5 [[summary]]

6 == Summary

7

8 -This document gathers tips, scripts and configuration files to help people

8 +This document gathers tips, scripts, and configuration files to help people

9 working on Git's codebase use their favorite tools while following Git's

10 coding style.

11

Documentation/config/clean.txt

+1 -1

@@ -1,3 +1,3 @@

1 clean.requireForce::

2 A boolean to make git-clean do nothing unless given -f,

3 - -i or -n. Defaults to true.

3 + -i, or -n. Defaults to true.

Documentation/config/color.txt

+1 -1

@@ -106,7 +106,7 @@ color.grep.<slot>::

106 matching text in context lines

107 `matchSelected`;;

108 matching text in selected lines. Also, used to customize the following

109 - linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.

109 + linkgit:git-log[1] subcommands: `--grep`, `--author`, and `--committer`.

110 `selected`;;

111 non-matching text in selected lines. Also, used to customize the

112 following linkgit:git-log[1] subcommands: `--grep`, `--author` and

Documentation/config/credential.txt

+1 -1

@@ -21,7 +21,7 @@ credential.username::

21

22 credential.<url>.*::

23 Any of the credential.* options above can be applied selectively to

24 - some credentials. For example "credential.https://example.com.username"

24 + some credentials. For example, "credential.https://example.com.username"

25 would set the default username only for https connections to

26 example.com. See linkgit:gitcredentials[7] for details on how URLs are

27 matched.

Documentation/config/fastimport.txt

+2 -2

@@ -1,8 +1,8 @@

1 fastimport.unpackLimit::

2 If the number of objects imported by linkgit:git-fast-import[1]

3 is below this limit, then the objects will be unpacked into

4 - loose object files. However if the number of imported objects

5 - equals or exceeds this limit then the pack will be stored as a

4 + loose object files. However, if the number of imported objects

5 + equals or exceeds this limit, then the pack will be stored as a

6 pack. Storing the pack from a fast-import can make the import

7 operation complete faster, especially on slow filesystems. If

8 not set, the value of `transfer.unpackLimit` is used instead.

Documentation/config/fsck.txt

+5 -5

@@ -13,10 +13,10 @@ The rest of the documentation discusses `fsck.*` for brevity, but the

13 same applies for the corresponding `receive.fsck.*` and

14 `fetch.fsck.*`. variables.

15 +

16 -Unlike variables like `color.ui` and `core.editor` the

16 +Unlike variables like `color.ui` and `core.editor`, the

17 `receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>` variables will not

18 fall back on the `fsck.<msg-id>` configuration if they aren't set. To

19 -uniformly configure the same fsck settings in different circumstances

19 +uniformly configure the same fsck settings in different circumstances,

20 all three of them must be set to the same values.

21 +

22 When `fsck.<msg-id>` is set, errors can be switched to warnings and

@@ -43,12 +43,12 @@ values of `<msg-id>`.

43 fsck.skipList::

44 The path to a list of object names (i.e. one unabbreviated SHA-1 per

45 line) that are known to be broken in a non-fatal way and should

46 - be ignored. On versions of Git 2.20 and later comments ('#'), empty

46 + be ignored. On versions of Git 2.20 and later, comments ('#'), empty

47 lines, and any leading and trailing whitespace are ignored. Everything

48 but a SHA-1 per line will error out on older versions.

49 +

50 This feature is useful when an established project should be accepted

51 -despite early commits containing errors that can be safely ignored

51 +despite early commits containing errors that can be safely ignored,

52 such as invalid committer email addresses. Note: corrupt objects

53 cannot be skipped with this setting.

54 +

@@ -58,7 +58,7 @@ Like `fsck.<msg-id>` this variable has corresponding

58 Unlike variables like `color.ui` and `core.editor` the

59 `receive.fsck.skipList` and `fetch.fsck.skipList` variables will not

60 fall back on the `fsck.skipList` configuration if they aren't set. To

61 -uniformly configure the same fsck settings in different circumstances

61 +uniformly configure the same fsck settings in different circumstances,

62 all three of them must be set to the same values.

63 +

64 Older versions of Git (before 2.20) documented that the object names

Documentation/config/log.txt

+1 -1

@@ -9,7 +9,7 @@ log.date::

9 `--date` option. See linkgit:git-log[1] for details.

10 +

11 If the format is set to "auto:foo" and the pager is in use, format

12 -"foo" will be used for the date format. Otherwise "default" will

12 +"foo" will be used for the date format. Otherwise, "default" will

13 be used.

14

15 log.decorate::

Documentation/config/merge.txt

+1 -1

@@ -7,7 +7,7 @@ merge.conflictStyle::

7 marker and the original text before the `=======` marker. The

8 "merge" style tends to produce smaller conflict regions than diff3,

9 both because of the exclusion of the original text, and because

10 - when a subset of lines match on the two sides they are just pulled

10 + when a subset of lines match on the two sides, they are just pulled

11 out of the conflict region. Another alternate style, "zdiff3", is

12 similar to diff3 but removes matching lines on the two sides from

13 the conflict region when those matching lines appear near either

Documentation/config/mergetool.txt

+5 -5

@@ -22,8 +22,8 @@ mergetool.<tool>.trustExitCode::

22 For a custom merge command, specify whether the exit code of

23 the merge command can be used to determine whether the merge was

24 successful. If this is not set to true then the merge target file

25 - timestamp is checked and the merge is assumed to have been successful

26 - if the file has been updated, otherwise the user is prompted to

25 + timestamp is checked, and the merge is assumed to have been successful

26 + if the file has been updated; otherwise, the user is prompted to

27 indicate the success of the merge.

28

29 mergetool.meld.hasOutput::

@@ -37,7 +37,7 @@ mergetool.meld.hasOutput::

37

38 mergetool.meld.useAutoMerge::

39 When the `--auto-merge` is given, meld will merge all non-conflicting

40 - parts automatically, highlight the conflicting parts and wait for

40 + parts automatically, highlight the conflicting parts, and wait for

41 user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells

42 Git to unconditionally use the `--auto-merge` option with `meld`.

43 Setting this value to `auto` makes git detect whether `--auto-merge`

@@ -55,7 +55,7 @@ endif::[]

55 for details.

56

57 mergetool.hideResolved::

58 - During a merge Git will automatically resolve as many conflicts as

58 + During a merge, Git will automatically resolve as many conflicts as

59 possible and write the 'MERGED' file containing conflict markers around

60 any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally

61 represent the versions of the file from before Git's conflict

@@ -74,7 +74,7 @@ mergetool.keepTemporaries::

74 When invoking a custom merge tool, Git uses a set of temporary

75 files to pass to the tool. If the tool returns an error and this

76 variable is set to `true`, then these temporary files will be

77 - preserved, otherwise they will be removed after the tool has

77 + preserved; otherwise, they will be removed after the tool has

78 exited. Defaults to `false`.

79

80 mergetool.writeToTemp::

Documentation/config/push.txt

+1 -1

@@ -67,7 +67,7 @@ new default).

67 --

68

69 push.followTags::

70 - If set to true enable `--follow-tags` option by default. You

70 + If set to true, enable `--follow-tags` option by default. You

71 may override this configuration at time of push by specifying

72 `--no-follow-tags`.

73

Documentation/config/sequencer.txt

+1 -1

@@ -2,4 +2,4 @@ sequence.editor::

2 Text editor used by `git rebase -i` for editing the rebase instruction file.

3 The value is meant to be interpreted by the shell when it is used.

4 It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.

5 - When not configured the default commit message editor is used instead.

5 + When not configured, the default commit message editor is used instead.

Documentation/config/splitindex.txt

+3 -3

@@ -3,10 +3,10 @@ splitIndex.maxPercentChange::

3 percent of entries the split index can contain compared to the

4 total number of entries in both the split index and the shared

5 index before a new shared index is written.

6 - The value should be between 0 and 100. If the value is 0 then

7 - a new shared index is always written, if it is 100 a new

6 + The value should be between 0 and 100. If the value is 0, then

7 + a new shared index is always written; if it is 100, a new

8 shared index is never written.

9 - By default the value is 20, so a new shared index is written

9 + By default, the value is 20, so a new shared index is written

10 if the number of entries in the split index would be greater

11 than 20 percent of the total number of entries.

12 See linkgit:git-update-index[1].

Documentation/config/user.txt

+2 -2

@@ -8,11 +8,11 @@ committer.email::

8 up in the `author` and `committer` fields of commit

9 objects.

10 If you need the `author` or `committer` to be different, the

11 - `author.name`, `author.email`, `committer.name` or

11 + `author.name`, `author.email`, `committer.name`, or

12 `committer.email` variables can be set.

13 All of these can be overridden by the `GIT_AUTHOR_NAME`,

14 `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,

15 - `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.

15 + `GIT_COMMITTER_EMAIL`, and `EMAIL` environment variables.

16 +

17 Note that the `name` forms of these variables conventionally refer to

18 some form of a personal name. See linkgit:git-commit[1] and the

Documentation/config/versionsort.txt

+1 -1

@@ -19,7 +19,7 @@ with those suffixes. E.g. if "-pre" appears before "-rc" in the

19 configuration, then all "1.0-preX" tags will be listed before any

20 "1.0-rcX" tags. The placement of the main release tag relative to tags

21 with various suffixes can be determined by specifying the empty suffix

22 -among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and

22 +among those other suffixes. E.g. if the suffixes "-rc", "", "-ck", and

23 "-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags

24 are listed first, followed by "v4.8", then "v4.8-ckX" and finally

25 "v4.8-bfsX".

Documentation/diff-generate-patch.txt

+2 -2

@@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted

156 files.

157 +

158 However, if the --combined-all-paths option is provided, instead of a

159 -two-line from-file/to-file you get an N+1 line from-file/to-file header,

159 +two-line from-file/to-file, you get an N+1 line from-file/to-file header,

160 where N is the number of parents in the merge commit:

161

162 --- a/file

@@ -197,7 +197,7 @@ added, from the point of view of that parent).

197 In the above example output, the function signature was changed

198 from both files (hence two `-` removals from both file1 and

199 file2, plus `++` to mean one line that was added does not appear

200 -in either file1 or file2). Also eight other lines are the same

200 +in either file1 or file2). Also, eight other lines are the same

201 from file1 but do not appear in file2 (hence prefixed with `+`).

202

203 When shown by `git diff-tree -c`, it compares the parents of a

Documentation/fetch-options.txt

+1 -1

@@ -96,7 +96,7 @@ endif::git-pull[]

96

97 -f::

98 --force::

99 - When 'git fetch' is used with `<src>:<dst>` refspec it may

99 + When 'git fetch' is used with `<src>:<dst>` refspec, it may

100 refuse to update the local branch as discussed

101 ifdef::git-pull[]

102 in the `<refspec>` part of the linkgit:git-fetch[1]

Documentation/git-am.txt

+2 -2

@@ -23,7 +23,7 @@ SYNOPSIS

23 DESCRIPTION

24 -----------

25 Splits mail messages in a mailbox into commit log messages,

26 -authorship information and patches, and applies them to the

26 +authorship information, and patches, and applies them to the

27 current branch. You could think of it as a reverse operation

28 of linkgit:git-format-patch[1] run on a branch with a straight

29 history without merges.

@@ -134,7 +134,7 @@ include::rerere-options.txt[]

134 automatically. This option allows the user to bypass the automatic

135 detection and specify the patch format that the patch(es) should be

136 interpreted as. Valid formats are mbox, mboxrd,

137 - stgit, stgit-series and hg.

137 + stgit, stgit-series, and hg.

138

139 -i::

140 --interactive::

Documentation/git-apply.txt

+5 -5

@@ -23,8 +23,8 @@ DESCRIPTION

23 Reads the supplied diff output (i.e. "a patch") and applies it to files.

24 When running from a subdirectory in a repository, patched paths

25 outside the directory are ignored.

26 -With the `--index` option the patch is also applied to the index, and

27 -with the `--cached` option the patch is only applied to the index.

26 +With the `--index` option, the patch is also applied to the index, and

27 +with the `--cached` option, the patch is only applied to the index.

28 Without these options, the command applies the patch only to files,

29 and does not require them to be in a Git repository.

30

@@ -52,7 +52,7 @@ OPTIONS

52 --summary::

53 Instead of applying the patch, output a condensed

54 summary of information obtained from git diff extended

55 - headers, such as creations, renames and mode changes.

55 + headers, such as creations, renames, and mode changes.

56 Turns off "apply".

57

58 --check::

@@ -140,7 +140,7 @@ linkgit:git-config[1]).

140 applying a diff generated with `--unified=0`. To bypass these

141 checks use `--unidiff-zero`.

142 +

143 -Note, for the reasons stated above the usage of context-free patches is

143 +Note, for the reasons stated above, the usage of context-free patches is

144 discouraged.

145

146 --apply::

@@ -161,7 +161,7 @@ discouraged.

161 --binary::

162 Historically we did not allow binary patch application

163 without an explicit permission from the user, and this

164 - flag was the way to do so. Currently we always allow binary

164 + flag was the way to do so. Currently, we always allow binary

165 patch application, so this is a no-op.

166

167 --exclude=<path-pattern>::

Documentation/git-check-attr.txt

+2 -2

@@ -38,7 +38,7 @@ OPTIONS

38

39 --source=<tree-ish>::

40 Check attributes against the specified tree-ish. It is common to

41 - specify the source tree by naming a commit, branch or tag associated

41 + specify the source tree by naming a commit, branch, or tag associated

42 with it.

43

44 \--::

@@ -60,7 +60,7 @@ unless `-z` is in effect, in which case NUL is used as delimiter:

60

61

62 <path> is the path of a file being queried, <attribute> is an attribute

63 -being queried and <info> can be either:

63 +being queried, and <info> can be either:

64

65 'unspecified';; when the attribute is not defined for the path.

66 'unset';; when the attribute is defined as false.

Documentation/git-checkout-index.txt

+1 -1

@@ -57,7 +57,7 @@ OPTIONS

57 Note: --stage=all automatically implies --temp.

58

59 --temp::

60 - Instead of copying the files to the working directory

60 + Instead of copying the files to the working directory,

61 write the content to temporary files. The temporary name

62 associations will be written to stdout.

63

Documentation/git-diff-files.txt

+2 -2

@@ -26,7 +26,7 @@ include::diff-options.txt[]

26 -2 --ours::

27 -3 --theirs::

28 -0::

29 - Diff against the "base" version, "our branch" or "their

29 + Diff against the "base" version, "our branch", or "their

30 branch" respectively. With these options, diffs for

31 merged entries are not shown.

32 +

@@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged".

37 -c::

38 --cc::

39 This compares stage 2 (our branch), stage 3 (their

40 - branch) and the working tree file and outputs a combined

40 + branch), and the working tree file and outputs a combined

41 diff, similar to the way 'diff-tree' shows a merge

42 commit with these flags.

43

Documentation/git-fast-import.txt

+1 -1

@@ -1353,7 +1353,7 @@ the marks back to the source repository, it is easy to verify the

1353 accuracy and completeness of the import by comparing each Git

1354 commit to the corresponding source revision.

1355

1356 -Coming from a system such as Perforce or Subversion this should be

1356 +Coming from a system such as Perforce or Subversion, this should be

1357 quite simple, as the fast-import mark can also be the Perforce changeset

1358 number or the Subversion revision number.

1359

Documentation/git-fsmonitor--daemon.txt

+2 -2

@@ -73,7 +73,7 @@ but it will not cause an incorrect result.

73 By default, the fsmonitor daemon refuses to work with network-mounted

74 repositories; this may be overridden by setting `fsmonitor.allowRemote` to

75 `true`. Note, however, that the fsmonitor daemon is not guaranteed to work

76 -correctly with all network-mounted repositories and such use is considered

76 +correctly with all network-mounted repositories, so such use is considered

77 experimental.

78

79 On Mac OS, the inter-process communication (IPC) between various Git

@@ -86,7 +86,7 @@ to work with these filesystems and such use is considered experimental.

86 By default, the socket is created in the `.git` directory. However, if the

87 `.git` directory is on a network-mounted filesystem, it will instead be

88 created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a

89 -network-mounted filesystem in which case you must set the configuration

89 +network-mounted filesystem, in which case you must set the configuration

90 variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native

91 filesystem in which to create the socket file.

92

Documentation/git-help.txt

+3 -3

@@ -59,7 +59,7 @@ OPTIONS

59 aliases.

60

61 --verbose::

62 - When used with `--all` print description for all recognized

62 + When used with `--all`, print description for all recognized

63 commands. This is the default.

64

65 -c::

@@ -129,8 +129,8 @@ line option:

129 * "info" corresponds to '-i|--info',

130 * "web" or "html" correspond to '-w|--web'.

131

132 -help.browser, web.browser and browser.<tool>.path

133 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

132 +help.browser, web.browser, and browser.<tool>.path

133 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

134

135 The `help.browser`, `web.browser` and `browser.<tool>.path` will also

136 be checked if the 'web' format is chosen (either by command-line

Documentation/git-http-push.txt

+1 -1

@@ -44,7 +44,7 @@ OPTIONS

44 -d::

45 -D::

46 Remove <ref> from remote repository. The specified branch

47 - cannot be the remote HEAD. If -d is specified the following

47 + cannot be the remote HEAD. If -d is specified, the following

48 other conditions must also be met:

49

50 - Remote HEAD must resolve to an object that exists locally

Documentation/git-merge-base.txt

+2 -2

@@ -88,7 +88,7 @@ For example, with this topology:

88

89 the merge base between 'A' and 'B' is '1'.

90

91 -Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the

91 +Given three commits 'A', 'B', and 'C', `git merge-base A B C` will compute the

92 merge base between 'A' and a hypothetical commit 'M', which is a merge

93 between 'B' and 'C'. For example, with this topology:

94

@@ -204,7 +204,7 @@ will find B0, and

204

205 $ git rebase --onto origin/master $fork_point topic

206

207 -will replay D0, D1 and D on top of B to create a new history of this

207 +will replay D0, D1, and D on top of B to create a new history of this

208 shape:

209

210 ....

Documentation/git-mergetool.txt

+2 -2

@@ -49,7 +49,7 @@ variable `mergetool.<tool>.cmd`.

49 +

50 When 'git mergetool' is invoked with this tool (either through the

51 `-t` or `--tool` option or the `merge.tool` configuration

52 -variable) the configured command line will be invoked with `$BASE`

52 +variable), the configured command line will be invoked with `$BASE`

53 set to the name of a temporary file containing the common base for

54 the merge, if available; `$LOCAL` set to the name of a temporary

55 file containing the contents of the file on the current branch;

@@ -81,7 +81,7 @@ success of the resolution after the custom tool has exited.

81

82 -g::

83 --gui::

84 - When 'git-mergetool' is invoked with the `-g` or `--gui` option

84 + When 'git-mergetool' is invoked with the `-g` or `--gui` option,

85 the default merge tool will be read from the configured

86 `merge.guitool` variable instead of `merge.tool`. If

87 `merge.guitool` is not set, we will fallback to the tool

Documentation/git-mv.txt

+1 -1

@@ -13,7 +13,7 @@ SYNOPSIS

13

14 DESCRIPTION

15 -----------

16 -Move or rename a file, directory or symlink.

16 +Move or rename a file, directory, or symlink.

17

18 git mv [-v] [-f] [-n] [-k] <source> <destination>

19 git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>

Documentation/git-name-rev.txt

+1 -1

@@ -26,7 +26,7 @@ OPTIONS

26

27 --refs=<pattern>::

28 Only use refs whose names match a given shell pattern. The pattern

29 - can be one of branch name, tag name or fully qualified ref name. If

29 + can be a branch name, a tag name, or a fully qualified ref name. If

30 given multiple times, use refs whose names match any of the given shell

31 patterns. Use `--no-refs` to clear any previous ref patterns given.

32

Documentation/git-remote-fd.txt

+2 -2

@@ -13,10 +13,10 @@ DESCRIPTION

13 -----------

14 This helper uses specified file descriptors to connect to a remote Git server.

15 This is not meant for end users but for programs and scripts calling git

16 -fetch, push or archive.

16 +fetch, push, or archive.

17

18 If only <infd> is given, it is assumed to be a bidirectional socket connected

19 -to remote Git server (git-upload-pack, git-receive-pack or

19 +to a remote Git server (git-upload-pack, git-receive-pack, or

20 git-upload-archive). If both <infd> and <outfd> are given, they are assumed

21 to be pipes connected to a remote Git server (<infd> being the inbound pipe

22 and <outfd> being the outbound pipe.

Documentation/git-request-pull.txt

+1 -1

@@ -16,7 +16,7 @@ DESCRIPTION

16 Generate a request asking your upstream project to pull changes into

17 their tree. The request, printed to the standard output,

18 begins with the branch description, summarizes

19 -the changes and indicates from where they can be pulled.

19 +the changes, and indicates from where they can be pulled.

20

21 The upstream project is expected to have the commit named by

22 `<start>` and the output asks it to integrate the changes you made

Documentation/git-show-branch.txt

+2 -2

@@ -125,7 +125,7 @@ OPTIONS

125 default to color output.

126 Same as `--color=never`.

127

128 -Note that --more, --list, --independent and --merge-base options

128 +Note that --more, --list, --independent, and --merge-base options

129 are mutually exclusive.

130

131

@@ -144,7 +144,7 @@ otherwise it shows a space. Merge commits are denoted by

144 a `-` sign. Each commit shows a short name that

145 can be used as an extended SHA-1 to name that commit.

146

147 -The following example shows three branches, "master", "fixes"

147 +The following example shows three branches, "master", "fixes",

148 and "mhf":

149

150 ------------------------------------------------

Documentation/git-update-index.txt

+1 -1

@@ -160,7 +160,7 @@ you will need to handle the situation manually.

160

161 --index-version <n>::

162 Write the resulting index out in the named on-disk format version.

163 - Supported versions are 2, 3 and 4. The current default version is 2

163 + Supported versions are 2, 3, and 4. The current default version is 2

164 or 3, depending on whether extra features are used, such as

165 `git add -N`. With `--verbose`, also report the version the index

166 file uses before and after this command.

Documentation/gitdiffcore.txt

+2 -2

@@ -231,7 +231,7 @@ like these:

231 * -B/60 (the same as above, since diffcore-break defaults to 50%).

232

233 Note that earlier implementation left a broken pair as separate

234 -creation and deletion patches. This was an unnecessary hack and

234 +creation and deletion patches. This was an unnecessary hack, and

235 the latest implementation always merges all the broken pairs

236 back into modifications, but the resulting patch output is

237 formatted differently for easier review in case of such

@@ -263,7 +263,7 @@ textual diff has an added or a deleted line that matches the given

263 regular expression. This means that it will detect in-file (or what

264 rename-detection considers the same file) moves, which is noise. The

265 implementation runs diff twice and greps, and this can be quite

266 -expensive. To speed things up binary files without textconv filters

266 +expensive. To speed things up, binary files without textconv filters

267 will be ignored.

268

269 When `-S` or `-G` are used without `--pickaxe-all`, only filepairs

Documentation/gitformat-pack.txt

+1 -1

@@ -18,7 +18,7 @@ DESCRIPTION

18 -----------

19

20 The Git pack format is how Git stores most of its primary repository

21 -data. Over the lifetime of a repository loose objects (if any) and

21 +data. Over the lifetime of a repository, loose objects (if any) and

22 smaller packs are consolidated into larger pack(s). See

23 linkgit:git-gc[1] and linkgit:git-pack-objects[1].

24

Documentation/technical/api-simple-ipc.txt

+2 -2

@@ -25,7 +25,7 @@ When received, the response is returned back to the caller.

25 For example, the `fsmonitor--daemon` feature will be built as a server

26 application on top of the IPC-server library routines. It will have

27 threads watching for file system events and a thread pool waiting for

28 -client connections. Clients, such as `git status` will request a list

28 +client connections. Clients, such as `git status`, will request a list

29 of file system events since a point in time and the server will

30 respond with a list of changed files and directories. The formats of

31 the request and response are application-specific; the IPC-client and

@@ -37,7 +37,7 @@ Comparison with sub-process model

37

38 The Simple-IPC mechanism differs from the existing `sub-process.c`

39 model (Documentation/technical/long-running-process-protocol.txt) and

40 -used by applications like Git-LFS. In the LFS-style sub-process model

40 +used by applications like Git-LFS. In the LFS-style sub-process model,

41 the helper is started by the foreground process, communication happens

42 via a pair of file descriptors bound to the stdin/stdout of the

43 sub-process, the sub-process only serves the current foreground

Documentation/technical/reftable.txt

+1 -1

@@ -175,7 +175,7 @@ log_index*

175 footer

176 ....

177

178 -In a log-only file the first log block immediately follows the file

178 +In a log-only file, the first log block immediately follows the file

179 header, without padding to block alignment.

180

181 Block size

documentation: add some commas where they are helpful