859a6d6045 · matheusbsbs/matheus-bagliano

Documentation/config/branch.txt

+1 -1

@@ -64,7 +64,7 @@ branch.<name>.merge::

64 handled like the remote part of a refspec, and must match a

65 ref which is fetched from the remote given by

66 "branch.<name>.remote".

67 - The merge information is used by 'git pull' (which at first calls

67 + The merge information is used by 'git pull' (which first calls

68 'git fetch') to lookup the default branch for merging. Without

69 this option, 'git pull' defaults to merge the first refspec fetched.

70 Specify multiple values to get an octopus merge.

Documentation/config/gpg.txt

+1 -1

@@ -38,7 +38,7 @@ gpg.minTrustLevel::

38 * `ultimate`

39

40 gpg.ssh.defaultKeyCommand::

41 - This command that will be run when user.signingkey is not set and a ssh

41 + This command will be run when user.signingkey is not set and a ssh

42 signature is requested. On successful exit a valid ssh public key

43 prefixed with `key::` is expected in the first line of its output.

44 This allows for a script doing a dynamic lookup of the correct public

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 the 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/sendemail.txt

+1 -1

@@ -36,7 +36,7 @@ sendemail.aliasesFile::

36

37 sendemail.aliasFileType::

38 Format of the file(s) specified in sendemail.aliasesFile. Must be

39 - one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'.

39 + one of 'mutt', 'mailrc', 'pine', 'elm', 'gnus', or 'sendmail'.

40 +

41 What an alias file in each format looks like can be found in

42 the documentation of the email program of the same name. The

Documentation/diff-generate-patch.txt

+1 -1

@@ -77,7 +77,7 @@ separate lines indicate the old and the new mode.

77

78 5. Hunk headers mention the name of the function to which the hunk

79 applies. See "Defining a custom hunk-header" in

80 - linkgit:gitattributes[5] for details of how to tailor to this to

80 + linkgit:gitattributes[5] for details of how to tailor this to

81 specific languages.

82

83

Documentation/git-diff-tree.txt

+1 -1

@@ -104,7 +104,7 @@ include::pretty-options.txt[]

104 This flag changes the way a merge commit patch is displayed,

105 in a similar way to the `-c` option. It implies the `-c`

106 and `-p` options and further compresses the patch output

107 - by omitting uninteresting hunks whose the contents in the parents

107 + by omitting uninteresting hunks whose contents in the parents

108 have only two variants and the merge result picks one of them

109 without modification. When all hunks are uninteresting, the commit

110 itself and the commit log message is not shown, just like in any other

Documentation/git-fsmonitor--daemon.txt

+1 -1

@@ -84,7 +84,7 @@ may or may not have the needed support; the fsmonitor daemon is not guaranteed

84 to work with these filesystems and such use is considered experimental.

85

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 be instead be

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

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

Documentation/githooks.txt

+1 -1

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

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

385 # NO, I reject it.

386 H: PKT-LINE(ng <ref> <reason>)

387 - # Fall through, let 'receive-pack' to execute it.

387 + # Fall through, let 'receive-pack' execute it.

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

389 H: PKT-LINE(option fall-through)

390 # OK, but has an alternate reference. The alternate reference name

Documentation/gitprotocol-common.txt

+1 -1

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

13 DESCRIPTION

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

15

16 -This document sets defines things common to various over-the-wire

16 +This document defines things common to various over-the-wire

17 protocols and file formats used in Git.

18

19 ABNF Notation

Documentation/gitprotocol-http.txt

+1 -1

@@ -42,7 +42,7 @@ both the "smart" and "dumb" HTTP protocols used by Git operate

42 by appending additional path components onto the end of the user

43 supplied `$GIT_URL` string.

44

45 -An example of a dumb client requesting for a loose object:

45 +An example of a dumb client requesting a loose object:

46

47 $GIT_URL: http://example.com:8080/git/repo.git

48 URL request: http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355

Documentation/pull-fetch-param.txt

+1 -1

@@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a

80 +

81 As with pushing with linkgit:git-push[1], all of the rules described

82 above about what's not allowed as an update can be overridden by

83 -adding an the optional leading `+` to a refspec (or using `--force`

83 +adding an optional leading `+` to a refspec (or using `--force`

84 command line option). The only exception to this is that no amount of

85 forcing will make the `refs/heads/*` namespace accept a non-commit

86 object.

Documentation/technical/parallel-checkout.txt

+1 -1

@@ -63,7 +63,7 @@ improvements over the sequential code, but there was still too much lock

63 contention. A `perf` profiling indicated that around 20% of the runtime

64 during a local Linux clone (on an SSD) was spent in locking functions.

65 For this reason this approach was rejected in favor of using multiple

66 -child processes, which led to a better performance.

66 +child processes, which led to better performance.

67

68 Multi-Process Solution

69 ----------------------

Documentation/technical/partial-clone.txt

+1 -1

@@ -322,7 +322,7 @@ Footnotes

322

323 [a] expensive-to-modify list of missing objects: Earlier in the design of

324 partial clone we discussed the need for a single list of missing objects.

325 - This would essentially be a sorted linear list of OIDs that the were

325 + This would essentially be a sorted linear list of OIDs that were

326 omitted by the server during a clone or subsequent fetches.

327

328 This file would need to be loaded into memory on every object lookup.

Documentation/technical/rerere.txt

+1 -1

@@ -145,7 +145,7 @@ Nested conflicts

145 Nested conflicts are handled very similarly to "simple" conflicts.

146 Similar to simple conflicts, the conflict is first normalized by

147 stripping the labels from conflict markers, stripping the common ancestor

148 -version, and the sorting the conflict hunks, both for the outer and the

148 +version, and sorting the conflict hunks, both for the outer and the

149 inner conflict. This is done recursively, so any number of nested

150 conflicts can be handled.

151

Documentation/urls-remotes.txt

+1 -1

@@ -33,7 +33,7 @@ config file would appear like this:

33 ------------

34

35 The `<pushurl>` is used for pushes only. It is optional and defaults

36 -to `<URL>`. Pushing to a remote affects all defined pushurls or to all

36 +to `<URL>`. Pushing to a remote affects all defined pushurls or all

37 defined urls if no pushurls are defined. Fetch, however, will only

38 fetch from the first defined url if multiple urls are defined.

39

documentation: remove extraneous words