04c8ce9c1c · matheusbsbs/matheus-bagliano

Documentation/diff-format.txt

+1 -1

@@ -58,7 +58,7 @@ Possible status letters are:

58 be committed)

59 - X: "unknown" change type (most probably a bug, please report it)

60

61 -Status letters C and M are always followed by a score (denoting the

61 +Status letters C and R are always followed by a score (denoting the

62 percentage of similarity between the source and target of the move or

63 copy), and are the only ones to be so.

64

Documentation/diff-generate-patch.txt

+3 -3

@@ -143,15 +143,15 @@ different from it.

143

144 A `-` character in the column N means that the line appears in

145 fileN but it does not appear in the result. A `+` character

146 -in the column N means that the line appears in the last file,

146 +in the column N means that the line appears in the result,

147 and fileN does not have that line (in other words, the line was

148 added, from the point of view of that parent).

149

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

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

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

153 -in either file1 nor file2). Also two other lines are the same

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

153 +in either file1 nor file2). Also eight other lines are the same

154 +from file1 but do not appear in file2 (hence prefixed with `{plus}`).

155

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

157 merge commit with the merge result (i.e. file1..fileN are the

Documentation/git-commit.txt

+1 -1

@@ -159,7 +159,7 @@ but can be used to amend a merge commit.

159 'git-commit' if any paths are given on the command line,

160 in which case this option can be omitted.

161 If this option is specified together with '--amend', then

162 - no paths need be specified, which can be used to amend

162 + no paths need to be specified, which can be used to amend

163 the last commit without committing changes that have

164 already been staged.

165

Documentation/git-diff-tree.txt

+1 -1

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

43 show tree entry itself as well as subtrees. Implies -r.

44

45 --root::

46 - When '--root' is specified the initial commit will be showed as a big

46 + When '--root' is specified the initial commit will be shown as a big

47 creation event. This is equivalent to a diff against the NULL tree.

48

49 --stdin::

Documentation/git-mailinfo.txt

+1 -1

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

13

14 DESCRIPTION

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

16 -Reading a single e-mail message from the standard input, and

16 +Reads a single e-mail message from the standard input, and

17 writes the commit log message in <msg> file, and the patches in

18 <patch> file. The author name, e-mail and e-mail subject are

19 written out to the standard output to be used by 'git-am'

Documentation/git-receive-pack.txt

+2 -2

@@ -86,7 +86,7 @@ post-receive Hook

86 -----------------

87 After all refs were updated (or attempted to be updated), if any

88 ref update was successful, and if $GIT_DIR/hooks/post-receive

89 -file exists and is executable, it will be invoke once with no

89 +file exists and is executable, it will be invoked once with no

90 parameters. The standard input of the hook will be one line

91 for each successfully updated ref:

92

@@ -133,7 +133,7 @@ post-update Hook

133 ----------------

134 After all other processing, if at least one ref was updated, and

135 if $GIT_DIR/hooks/post-update file exists and is executable, then

136 -post-update will called with the list of refs that have been updated.

136 +post-update will be called with the list of refs that have been updated.

137 This can be used to implement any repository wide cleanup tasks.

138

139 The exit code from this hook invocation is ignored; the only thing

Documentation/git-reflog.txt

+2 -2

@@ -28,7 +28,7 @@ updated. This command is to manage the information recorded in it.

28

29 The subcommand "expire" is used to prune older reflog entries.

30 Entries older than `expire` time, or entries older than

31 -`expire-unreachable` time and are not reachable from the current

31 +`expire-unreachable` time and not reachable from the current

32 tip, are removed from the reflog. This is typically not used

33 directly by the end users -- instead, see linkgit:git-gc[1].

34

@@ -71,7 +71,7 @@ them.

71 which in turn defaults to 90 days.

72

73 --expire-unreachable=<time>::

74 - Entries older than this time and are not reachable from

74 + Entries older than this time and not reachable from

75 the current tip of the branch are pruned. Without the

76 option it is taken from configuration

77 `gc.reflogExpireUnreachable`, which in turn defaults to

Documentation/git-show-branch.txt

+1 -1

@@ -30,7 +30,7 @@ OPTIONS

30 -------

31 <rev>::

32 Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])

33 - that typically names a branch HEAD or a tag.

33 + that typically names a branch head or a tag.

34

35 <glob>::

36 A glob pattern that matches branch or tag names under

Documentation/git-submodule.txt

+1 -1

@@ -85,7 +85,7 @@ use by subsequent users cloning the superproject. If the URL is

85 given relative to the superproject's repository, the presumption

86 is the superproject and submodule repositories will be kept

87 together in the same relative location, and only the

88 -superproject's URL need be provided: git-submodule will correctly

88 +superproject's URL needs to be provided: git-submodule will correctly

89 locate the submodule using the relative URL in .gitmodules.

90

91 status::

Documentation/git-update-index.txt

+4 -4

@@ -55,7 +55,7 @@ OPTIONS

55 default behavior is to error out. This option makes

56 'git-update-index' continue anyway.

57

58 ---ignore-submodules:

58 +--ignore-submodules::

59 Do not try to update submodules. This option is only respected

60 when passed before --refresh.

61

@@ -78,9 +78,9 @@ OPTIONS

78

79 --assume-unchanged::

80 --no-assume-unchanged::

81 - When these flags are specified, the object name recorded

81 + When these flags are specified, the object names recorded

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

83 - sets and unsets the "assume unchanged" bit for the

83 + set and unset the "assume unchanged" bit for the

84 paths. When the "assume unchanged" bit is on, git stops

85 checking the working tree files for possible

86 modifications, so you need to manually unset the bit to

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

122 'git-update-index' refuses an attempt to add `path/file`.

123 Similarly if a file `path/file` exists, a file `path`

124 cannot be added. With --replace flag, existing entries

125 - that conflicts with the entry being added are

125 + that conflict with the entry being added are

126 automatically removed with warning messages.

127

128 --stdin::

Documentation/gitcore-tutorial.txt

+4 -4

@@ -999,8 +999,8 @@ Fast forward

999 2 files changed, 2 insertions(+), 0 deletions(-)

1000 ----------------

1001

1002 -Because your branch did not contain anything more than what are

1003 -already merged into the `master` branch, the merge operation did

1002 +Because your branch did not contain anything more than what had

1003 +already been merged into the `master` branch, the merge operation did

1004 not actually do a merge. Instead, it just updated the top of

1005 the tree of your branch to that of the `master` branch. This is

1006 often called 'fast forward' merge.

@@ -1353,7 +1353,7 @@ $ GIT_DIR=my-git.git git init

1353 ------------

1354

1355 Make sure this directory is available for others you want your

1356 -changes to be pulled by via the transport of your choice. Also

1356 +changes to be pulled via the transport of your choice. Also

1357 you need to make sure that you have the 'git-receive-pack'

1358 program on the `$PATH`.

1359

@@ -1512,7 +1512,7 @@ You can repack this private repository whenever you feel like.

1512 6. Push your changes to the public repository, and announce it

1513 to the public.

1514

1515 -7. Every once in a while, "git-repack" the public repository.

1515 +7. Every once in a while, 'git-repack' the public repository.

1516 Go back to step 5. and continue working.

1517

1518

Documentation/gitk.txt

+2 -2

@@ -21,7 +21,7 @@ git repository.

21

22 OPTIONS

23 -------

24 -To control which revisions to shown, the command takes options applicable to

24 +To control which revisions to show, the command takes options applicable to

25 the 'git-rev-list' command (see linkgit:git-rev-list[1]).

26 This manual page describes only the most

27 frequently used options.

@@ -75,7 +75,7 @@ Examples

75 --------

76 gitk v2.6.12.. include/scsi drivers/scsi::

77

78 - Show as the changes since version 'v2.6.12' that changed any

78 + Show the changes since version 'v2.6.12' that changed any

79 file in the include/scsi or drivers/scsi subdirectories

80

81 gitk --since="2 weeks ago" \-- gitk::

Documentation/i18n.txt

+2 -2

@@ -7,11 +7,11 @@ At the core level, git is character encoding agnostic.

7 to be what lstat(2) and creat(2) accepts. There is no such

8 thing as pathname encoding translation.

9

10 - - The contents of the blob objects are uninterpreted sequence

10 + - The contents of the blob objects are uninterpreted sequences

11 of bytes. There is no encoding translation at the core

12 level.

13

14 - - The commit log messages are uninterpreted sequence of non-NUL

14 + - The commit log messages are uninterpreted sequences of non-NUL

15 bytes.

16

17 Although we encourage that the commit log messages are encoded

Documentation: fix typos, grammar, asciidoc syntax