9a9fd289cc · matheusbsbs/matheus-bagliano

Documentation/SubmittingPatches

+1 -1

@@ -87,7 +87,7 @@ maintainer.

87 Under truly exceptional circumstances where you absolutely must depend

88 on a select few topic branches that are already in `next` but not in

89 `master`, you may want to create your own custom base-branch by forking

90 -`master` and merging the required topic branches to it. You could then

90 +`master` and merging the required topic branches into it. You could then

91 work on top of this base-branch. But keep in mind that this base-branch

92 would only be known privately to you. So when you are ready to send

93 your patches to the list, be sure to communicate how you created it in

Documentation/config/branch.txt

+1 -1

@@ -99,5 +99,5 @@ for details).

99 branch.<name>.description::

100 Branch description, can be edited with

101 `git branch --edit-description`. Branch description is

102 - automatically added in the format-patch cover letter or

102 + automatically added to the format-patch cover letter or

103 request-pull summary.

Documentation/config/i18n.txt

+1 -1

@@ -2,7 +2,7 @@ i18n.commitEncoding::

2 Character encoding the commit messages are stored in; Git itself

3 does not care per se, but this information is necessary e.g. when

4 importing commits from emails or in the gitk graphical history

5 - browser (and possibly at other places in the future or in other

5 + browser (and possibly in other places in the future or in other

6 porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.

7

8 i18n.logOutputEncoding::

Documentation/diff-generate-patch.txt

+2 -2

@@ -17,7 +17,7 @@ You can customize the creation of patch text via the

17 What the -p option produces is slightly different from the traditional

18 diff format:

19

20 -1. It is preceded with a "git diff" header that looks like this:

20 +1. It is preceded by a "git diff" header that looks like this:

21

22 diff --git a/file1 b/file2

23 +

@@ -123,7 +123,7 @@ index fabadb8,cc95eb0..4866510

123 for_each_ref(get_name);

124 ------------

125

126 -1. It is preceded with a "git diff" header, that looks like

126 +1. It is preceded by a "git diff" header, that looks like

127 this (when the `-c` option is used):

128

129 diff --combined file

Documentation/git-am.txt

+1 -1

@@ -69,7 +69,7 @@ OPTIONS

69 --empty=(stop|drop|keep)::

70 By default, or when the option is set to 'stop', the command

71 errors out on an input e-mail message lacking a patch

72 - and stops into the middle of the current am session. When this

72 + and stops in the middle of the current am session. When this

73 option is set to 'drop', skip such an e-mail message instead.

74 When this option is set to 'keep', create an empty commit,

75 recording the contents of the e-mail message as its log.

Documentation/git-diff-files.txt

+1 -1

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

42 commit with these flags.

43

44 -q::

45 - Remain silent even on nonexistent files

45 + Remain silent even for nonexistent files

46

47

48 include::diff-format.txt[]

Documentation/git-fsmonitor--daemon.txt

+1 -1

@@ -70,7 +70,7 @@ the change (as happening against the super repo). However, the client

70 will properly ignore these extra events, so performance may be affected

71 but it will not cause an incorrect result.

72

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

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

Documentation/git-hook.txt

+1 -1

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

13 DESCRIPTION

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

15

16 -A command interface to running git hooks (see linkgit:githooks[5]),

16 +A command interface for running git hooks (see linkgit:githooks[5]),

17 for use by other scripted git commands.

18

19 SUBCOMMANDS

Documentation/git-merge-base.txt

+2 -2

@@ -28,7 +28,7 @@ merge base for a pair of commits.

28 OPERATION MODES

29 ---------------

30

31 -As the most common special case, specifying only two commits on the

31 +In the most common special case, specifying only two commits on the

32 command line means computing the merge base between the given two commits.

33

34 More generally, among the two commits to compute the merge base from,

@@ -64,7 +64,7 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option.

64 the two commits, but also takes into account the reflog of

65 <ref> to see if the history leading to <commit> forked from

66 an earlier incarnation of the branch <ref> (see discussion

67 - on this mode below).

67 + of this mode below).

68

69 OPTIONS

70 -------

Documentation/git-mergetool.txt

+1 -1

@@ -17,7 +17,7 @@ Use `git mergetool` to run one of several merge utilities to resolve

17 merge conflicts. It is typically run after 'git merge'.

18

19 If one or more <file> parameters are given, the merge tool program will

20 -be run to resolve differences on each file (skipping those without

20 +be run to resolve differences in each file (skipping those without

21 conflicts). Specifying a directory will include all unresolved files in

22 that path. If no <file> names are specified, 'git mergetool' will run

23 the merge tool program on every file with merge conflicts.

Documentation/git-request-pull.txt

+1 -1

@@ -50,7 +50,7 @@ EXAMPLES

50 --------

51

52 Imagine that you built your work on your `master` branch on top of

53 -the `v1.0` release, and want it to be integrated to the project.

53 +the `v1.0` release, and want it to be integrated into the project.

54 First you push that change to your public repository for others to

55 see:

56

Documentation/git-rev-parse.txt

+1 -1

@@ -383,7 +383,7 @@ Each line of options has this format:

383 dash to separate words in a multi-word argument hint.

384

385 The remainder of the line, after stripping the spaces, is used

386 -as the help associated to the option.

386 +as the help associated with the option.

387

388 Blank lines are ignored, and lines that don't match this specification are used

389 as option group headers (start the line with a space to create such

Documentation/git-show-branch.txt

+2 -2

@@ -50,7 +50,7 @@ OPTIONS

50

51 --current::

52 With this option, the command includes the current

53 - branch to the list of revs to be shown when it is not

53 + branch in the list of revs to be shown when it is not

54 given on the command line.

55

56 --topo-order::

@@ -197,7 +197,7 @@ $ git show-branch --reflog="10,1 hour ago" --list master

197

198 shows 10 reflog entries going back from the tip as of 1 hour ago.

199 Without `--list`, the output also shows how these tips are

200 -topologically related with each other.

200 +topologically related to each other.

201

202 CONFIGURATION

203 -------------

Documentation/git-update-index.txt

+1 -1

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

127 -g::

128 --again::

129 Runs 'git update-index' itself on the paths whose index

130 - entries are different from those from the `HEAD` commit.

130 + entries are different from those of the `HEAD` commit.

131

132 --unresolve::

133 Restores the 'unmerged' or 'needs updating' state of a

documentation: use clearer prepositions