6cc668c0ab · 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 file 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/advice.txt

+1 -1

@@ -63,7 +63,7 @@ advice.*::

63 the template shown when writing commit messages in

64 linkgit:git-commit[1], and in the help message shown

65 by linkgit:git-switch[1] or

66 - linkgit:git-checkout[1] when switching branch.

66 + linkgit:git-checkout[1] when switching branches.

67 statusUoption::

68 Advise to consider using the `-u` option to linkgit:git-status[1]

69 when the command takes more than 2 seconds to enumerate untracked

Documentation/config/column.txt

+1 -1

@@ -51,5 +51,5 @@ column.status::

51 See `column.ui` for details.

52

53 column.tag::

54 - Specify whether to output tag listing in `git tag` in columns.

54 + Specify whether to output tag listings in `git tag` in columns.

55 See `column.ui` for details.

Documentation/config/diff.txt

+1 -1

@@ -1,6 +1,6 @@

1 diff.autoRefreshIndex::

2 When using 'git diff' to compare with work tree

3 - files, do not consider stat-only change as changed.

3 + files, do not consider stat-only changes as changed.

4 Instead, silently run `git update-index --refresh` to

5 update the cached stat information for paths whose

6 contents in the work tree match the contents in the

Documentation/config/fetch.txt

+1 -1

@@ -53,7 +53,7 @@ fetch.pruneTags::

53 fetch.output::

54 Control how ref update status is printed. Valid values are

55 `full` and `compact`. Default value is `full`. See the

56 - OUTPUT section in linkgit:git-fetch[1] for detail.

56 + OUTPUT section in linkgit:git-fetch[1] for details.

57

58 fetch.negotiationAlgorithm::

59 Control how information about the commits in the local repository

Documentation/config/mailinfo.txt

+1 -1

@@ -1,6 +1,6 @@

1 mailinfo.scissors::

2 If true, makes linkgit:git-mailinfo[1] (and therefore

3 linkgit:git-am[1]) act by default as if the --scissors option

4 - was provided on the command-line. When active, this features

4 + was provided on the command-line. When active, this feature

5 removes everything from the message body before a scissors

6 line (i.e. consisting mainly of ">8", "8<" and "-").

Documentation/config/rerere.txt

+1 -1

@@ -1,7 +1,7 @@

1 rerere.autoUpdate::

2 When set to true, `git-rerere` updates the index with the

3 resulting contents after it cleanly resolves conflicts using

4 - previously recorded resolution. Defaults to false.

4 + previously recorded resolutions. Defaults to false.

5

6 rerere.enabled::

7 Activate recording of resolved conflicts, so that identical

Documentation/config/user.txt

+1 -1

@@ -5,7 +5,7 @@ author.email::

5 committer.name::

6 committer.email::

7 The `user.name` and `user.email` variables determine what ends

8 - up in the `author` and `committer` field of commit

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

Documentation/config/versionsort.txt

+2 -2

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

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

25 "v4.8-bfsX".

26 +

27 -If more than one suffixes match the same tagname, then that tagname will

27 +If more than one suffix matches the same tagname, then that tagname will

28 be sorted according to the suffix which starts at the earliest position in

29 -the tagname. If more than one different matching suffixes start at

29 +the tagname. If more than one different matching suffix starts at

30 that earliest position, then that tagname will be sorted according to the

31 longest of those suffixes.

32 The sorting order between different suffixes is undefined if they are

Documentation/diff-generate-patch.txt

+1 -1

@@ -142,7 +142,7 @@ or like this (when the `--cc` option is used):

142 +

143 The `mode <mode>,<mode>..<mode>` line appears only if at least one of

144 the <mode> is different from the rest. Extended headers with

145 -information about detected contents movement (renames and

145 +information about detected content movement (renames and

146 copying detection) are designed to work with diff of two

147 <tree-ish> and are not used by combined diff format.

148

Documentation/git-am.txt

+1 -1

@@ -22,7 +22,7 @@ SYNOPSIS

22

23 DESCRIPTION

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

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

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

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

Documentation/git-merge-tree.txt

+3 -3

@@ -24,7 +24,7 @@ this documentation describes modern `--write-tree` mode.

24 Performs a merge, but does not make any new commits and does not read

25 from or write to either the working tree or index.

26

27 -The performed merge will use the same feature as the "real"

27 +The performed merge will use the same features as the "real"

28 linkgit:git-merge[1], including:

29

30 * three way content merges of individual files

@@ -253,7 +253,7 @@ Do NOT attempt to guess or make the user guess the conflict types from

253 the <<CFI,Conflicted file info>> list. The information there is

254 insufficient to do so. For example: Rename/rename(1to2) conflicts (both

255 sides renamed the same file differently) will result in three different

256 -file having higher order stages (but each only has one higher order

256 +files having higher order stages (but each only has one higher order

257 stage), with no way (short of the <<IM,Informational messages>> section)

258 to determine which three files are related. File/directory conflicts

259 also result in a file with exactly one higher order stage.

@@ -263,7 +263,7 @@ a file with exactly one higher order stage. In all cases, the

263 <<IM,Informational messages>> section has the necessary info, though it

264 is not designed to be machine parseable.

265

266 -Do NOT assume that each paths from <<CFI,Conflicted file info>>, and

266 +Do NOT assume that each path from <<CFI,Conflicted file info>>, and

267 the logical conflicts in the <<IM,Informational messages>> have a

268 one-to-one mapping, nor that there is a one-to-many mapping, nor a

269 many-to-one mapping. Many-to-many mappings exist, meaning that each

Documentation/git-repack.txt

+1 -1

@@ -207,7 +207,7 @@ When `--unpacked` is specified, loose objects are implicitly included in

207 this "roll-up", without respect to their reachability. This is subject

208 to change in the future. This option (implying a drastically different

209 repack mode) is not guaranteed to work with all other combinations of

210 -option to `git repack`.

210 +options to `git repack`.

211 +

212 When writing a multi-pack bitmap, `git repack` selects the largest resulting

213 pack as the preferred pack for object selection by the MIDX (see

Documentation/git-replace.txt

+1 -1

@@ -111,7 +111,7 @@ OPTIONS

111 FORMATS

112 -------

113

114 -The following format are available:

114 +The following formats are available:

115

116 * 'short':

117 <replaced sha1>

Documentation/git-send-pack.txt

+2 -2

@@ -115,7 +115,7 @@ both on the local side and on the remote side are updated.

115

116 When one or more '<ref>' are specified explicitly (whether on the

117 command line or via `--stdin`), it can be either a

118 -single pattern, or a pair of such pattern separated by a colon

118 +single pattern, or a pair of such patterns separated by a colon

119 ":" (this means that a ref name cannot have a colon in it). A

120 single pattern '<name>' is just shorthand for '<name>:<name>'.

121

@@ -130,7 +130,7 @@ name. See linkgit:git-rev-parse[1].

130 - It is an error if <src> does not match exactly one of the

131 local refs.

132

133 - - It is an error if <dst> matches more than one remote refs.

133 + - It is an error if <dst> matches more than one remote ref.

134

135 - If <dst> does not match any remote ref, either

136

Documentation/git-show-branch.txt

+1 -1

@@ -154,7 +154,7 @@ $ git show-branch master fixes mhf

154 ! [mhf] Allow "+remote:local" refspec to cause --force when fetching.

155 ---

156 + [mhf] Allow "+remote:local" refspec to cause --force when fetching.

157 - + [mhf~1] Use git-octopus when pulling more than one heads.

157 + + [mhf~1] Use git-octopus when pulling more than one head.

158 + [fixes] Introduce "reset type" flag to "git reset"

159 + [mhf~2] "git fetch --force".

160 + [mhf~3] Use .git/remote/origin, not .git/branches/origin.

Documentation/git-show.txt

+1 -1

@@ -61,7 +61,7 @@ EXAMPLES

61 --------

62

63 `git show v1.0.0`::

64 - Shows the tag `v1.0.0`, along with the object the tags

64 + Shows the tag `v1.0.0`, along with the object the tag

65 points at.

66

67 `git show v1.0.0^{tree}`::

Documentation/git-update-index.txt

+3 -3

@@ -49,7 +49,7 @@ OPTIONS

49 --remove::

50 If a specified file is in the index but is missing then it's

51 removed.

52 - Default behavior is to ignore removed file.

52 + Default behavior is to ignore removed files.

53

54 --refresh::

55 Looks at the current index and checks to see if merges or

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

108 without regard to the "assume unchanged" setting.

109

110 --[no-]skip-worktree::

111 - When one of these flags is specified, the object name recorded

111 + When one of these flags is specified, the object names recorded

112 for the paths are not updated. Instead, these options

113 set and unset the "skip-worktree" bit for the paths. See

114 section "Skip-worktree bit" below for more information.

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

119 the `--remove` option was specified.

120

121 --[no-]fsmonitor-valid::

122 - When one of these flags is specified, the object name recorded

122 + When one of these flags is specified, the object names recorded

123 for the paths are not updated. Instead, these options

124 set and unset the "fsmonitor valid" bit for the paths. See

125 section "File System Monitor" below for more information.

Documentation/git-whatchanged.txt

+1 -1

@@ -3,7 +3,7 @@ git-whatchanged(1)

3

4 NAME

5 ----

6 -git-whatchanged - Show logs with difference each commit introduces

6 +git-whatchanged - Show logs with differences each commit introduces

7

8

9 SYNOPSIS

Documentation/gitcli.txt

+1 -1

@@ -26,7 +26,7 @@ arguments. Here are the rules:

26 accept dashed options after you have already given non-option

27 arguments (which may make the command ambiguous), but you should

28 not rely on it (because eventually we may find a way to fix

29 - these ambiguity by enforcing the "options then args" rule).

29 + these ambiguities by enforcing the "options then args" rule).

30

31 * Revisions come first and then paths.

32 E.g. in `git diff v1.0 v2.0 arch/x86 include/asm-x86`,

Documentation/gitdiffcore.txt

+1 -1

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

230

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

232

233 -Note that earlier implementation left a broken pair as a separate

233 +Note that earlier implementation left a broken pair as separate

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

Documentation/giteveryday.txt

+1 -1

@@ -14,7 +14,7 @@ DESCRIPTION

14 -----------

15

16 Git users can broadly be grouped into four categories for the purposes of

17 -describing here a small set of useful command for everyday Git.

17 +describing here a small set of useful commands for everyday Git.

18

19 * <<STANDALONE,Individual Developer (Standalone)>> commands are essential

20 for anybody who makes a commit, even for somebody who works alone.

Documentation/githooks.txt

+2 -2

@@ -80,7 +80,7 @@ If it exits with non-zero status, then the working tree will not be

80 committed after applying the patch.

81

82 It can be used to inspect the current working tree and refuse to

83 -make a commit if it does not pass certain test.

83 +make a commit if it does not pass certain tests.

84

85 The default 'pre-applypatch' hook, when enabled, runs the

86 'pre-commit' hook, if the latter is enabled.

@@ -379,7 +379,7 @@ following example for the protocol, the letter 'S' stands for

379 S: ... ...

380 S: flush-pkt

381

382 - # Receive result from the hook.

382 + # Receive results from the hook.

383 # OK, run this command successfully.

384 H: PKT-LINE(ok <ref>)

385 # NO, I reject it.

Documentation/gitsubmodules.txt

+1 -1

@@ -192,7 +192,7 @@ For example:

192 [submodule "baz"]

193 url = https://example.org/baz

194

195 -In the above config only the submodule 'bar' and 'baz' are active,

195 +In the above config only the submodules 'bar' and 'baz' are active,

196 'bar' due to (1) and 'baz' due to (3). 'foo' is inactive because

197 (1) takes precedence over (3)

198

Documentation/mergetools/vimdiff.txt

+1 -1

@@ -162,7 +162,7 @@ information as the first tab, with a different layout.

162 | REMOTE | |

163 ---------------------------------------------

164 ....

165 -Note how in the third tab definition we need to use parenthesis to make `,`

165 +Note how in the third tab definition we need to use parentheses to make `,`

166 have precedence over `/`.

167 --

168

Documentation/technical/api-index-skel.txt

+1 -1

@@ -1,7 +1,7 @@

1 Git API Documents

2 =================

3

4 -Git has grown a set of internal API over time. This collection

4 +Git has grown a set of internal APIs over time. This collection

5 documents them.

6

7 ////////////////////////////////////////////////////////////////

Documentation/technical/racy-git.txt

+1 -1

@@ -190,7 +190,7 @@ In a large project where raciness avoidance cost really matters,

190 however, the initial computation of all object names in the

191 index takes more than one second, and the index file is written

192 out after all that happens. Therefore the timestamp of the

193 -index file will be more than one seconds later than the

193 +index file will be more than one second later than the

194 youngest file in the working tree. This means that in these

195 cases there actually will not be any racily clean entry in

196 the resulting index.

Documentation/technical/repository-version.txt

+1 -1

@@ -96,7 +96,7 @@ The value of this key is the name of the promisor remote.

96 ==== `worktreeConfig`

97

98 If set, by default "git config" reads from both "config" and

99 -"config.worktree" file from GIT_DIR in that order. In

99 +"config.worktree" files from GIT_DIR in that order. In

100 multiple working directory mode, "config" file is shared while

101 "config.worktree" is per-working directory (i.e., it's in

102 GIT_COMMON_DIR/worktrees/<id>/config.worktree)

Documentation/urls-remotes.txt

+1 -1

@@ -48,7 +48,7 @@ provide a refspec on the command line. This file should have the

48 following format:

49

50 ------------

51 - URL: one of the above URL format

51 + URL: one of the above URL formats

52 Push: <refspec>

53 Pull: <refspec>

54

documentation: fix singular vs. plural