8936352242 · matheusbsbs/matheus-bagliano

Documentation/config/advice.txt

+1 -1

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

101 otherwise caused a remote-tracking branch to be

102 checked out. See the `checkout.defaultRemote`

103 configuration variable for how to set a given remote

104 - to used by default in some situations where this

104 + to be used by default in some situations where this

105 advice would be printed.

106 amWorkDir::

107 Advice that shows the location of the patch file when

Documentation/config/checkout.txt

+1 -1

@@ -39,6 +39,6 @@ well the parallel version performs.

39 checkout.thresholdForParallelism::

40 When running parallel checkout with a small number of files, the cost

41 of subprocess spawning and inter-process communication might outweigh

42 - the parallelization gains. This setting allows to define the minimum

42 + the parallelization gains. This setting allows you to define the minimum

43 number of files for which parallel checkout should be attempted. The

44 default is 100.

Documentation/config/http.txt

+1 -1

@@ -254,7 +254,7 @@ http.lowSpeedLimit, http.lowSpeedTime::

254

255 http.noEPSV::

256 A boolean which disables using of EPSV ftp command by curl.

257 - This can helpful with some "poor" ftp servers which don't

257 + This can be helpful with some "poor" ftp servers which don't

258 support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV`

259 environment variable. Default is false (curl will use EPSV).

260

Documentation/config/mergetool.txt

+1 -1

@@ -22,7 +22,7 @@ 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 assumed to have been successful

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

Documentation/config/sendemail.txt

+1 -1

@@ -91,7 +91,7 @@ sendemail.smtpBatchSize::

91 See also the `--batch-size` option of linkgit:git-send-email[1].

92

93 sendemail.smtpReloginDelay::

94 - Seconds wait before reconnecting to smtp server.

94 + Seconds to wait before reconnecting to smtp server.

95 See also the `--relogin-delay` option of linkgit:git-send-email[1].

96

97 sendemail.forbidSendmailVariables::

Documentation/git-checkout.txt

+1 -1

@@ -43,7 +43,7 @@ $ git checkout -b <branch> --track <remote>/<branch>

43 You could omit `<branch>`, in which case the command degenerates to

44 "check out the current branch", which is a glorified no-op with

45 rather expensive side-effects to show only the tracking information,

46 -if exists, for the current branch.

46 +if it exists, for the current branch.

47

48 'git checkout' -b|-B <new-branch> [<start-point>]::

49

Documentation/git-credential-cache.txt

+1 -1

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

16

17 This command caches credentials for use by future Git programs.

18 The stored credentials are kept in memory of the cache-daemon

19 -process (instead of written to a file) and are forgotten after a

19 +process (instead of being written to a file) and are forgotten after a

20 configurable timeout. Credentials are forgotten sooner if the

21 cache-daemon dies, for example if the system restarts. The cache

22 is accessible over a Unix domain socket, restricted to the current

Documentation/git-credential-store.txt

+1 -1

@@ -33,7 +33,7 @@ OPTIONS

33

34 Use `<path>` to lookup and store credentials. The file will have its

35 filesystem permissions set to prevent other users on the system

36 - from reading it, but will not be encrypted or otherwise

36 + from reading it, but it will not be encrypted or otherwise

37 protected. If not specified, credentials will be searched for from

38 `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and

39 credentials will be written to `~/.git-credentials` if it exists, or

Documentation/git-difftool.txt

+1 -1

@@ -78,7 +78,7 @@ with custom merge tool commands and has the same value as `$MERGED`.

78 Print a list of diff tools that may be used with `--tool`.

79

80 --[no-]symlinks::

81 - 'git difftool''s default behavior is create symlinks to the

81 + 'git difftool''s default behavior is to create symlinks to the

82 working tree when run in `--dir-diff` mode and the right-hand

83 side of the comparison yields the same content as the file in

84 the working tree.

Documentation/git-fetch-pack.txt

+1 -1

@@ -69,7 +69,7 @@ be in a separate packet, and the list must end with a flush packet.

69

70 --upload-pack=<git-upload-pack>::

71 Use this to specify the path to 'git-upload-pack' on the

72 - remote side, if is not found on your $PATH.

72 + remote side, if it is not found on your $PATH.

73 Installations of sshd ignores the user's environment

74 setup scripts for login shells (e.g. .bash_profile) and

75 your privately installed git may not be found on the system

Documentation/git-mktag.txt

+1 -1

@@ -27,7 +27,7 @@ write a tag found in `my-tag`:

27 The difference is that mktag will die before writing the tag if the

28 tag doesn't pass a linkgit:git-fsck[1] check.

29

30 -The "fsck" check done mktag is stricter than what linkgit:git-fsck[1]

30 +The "fsck" check done by mktag is stricter than what linkgit:git-fsck[1]

31 would run by default in that all `fsck.<msg-id>` messages are promoted

32 from warnings to errors (so e.g. a missing "tagger" line is an error).

33

Documentation/git-prune-packed.txt

+1 -1

@@ -15,7 +15,7 @@ SYNOPSIS

15 DESCRIPTION

16 -----------

17 This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently

18 -exist in a pack file as well as the independent object directories.

18 +exist in a pack file as well as in the independent object directories.

19

20 All such extra objects are removed.

21

Documentation/git-restore.txt

+1 -1

@@ -199,7 +199,7 @@ the same as using linkgit:git-reset[1])

199 $ git restore --staged hello.c

200 ------------

201

202 -or you can restore both the index and the working tree (this the same

202 +or you can restore both the index and the working tree (this is the same

203 as using linkgit:git-checkout[1])

204

205 ------------

Documentation/gitprotocol-v2.txt

+1 -1

@@ -29,7 +29,7 @@ protocol. Protocol v2 will improve upon v1 in the following ways:

29 semantics the http remote helper can simply act as a proxy

30

31 In protocol v2 communication is command oriented. When first contacting a

32 -server a list of capabilities will advertised. Some of these capabilities

32 +server a list of capabilities will be advertised. Some of these capabilities

33 will be commands which a client can request be executed. Once a command

34 has completed, a client can reuse the connection and request that other

35 commands be executed.

Documentation/howto/use-git-daemon.txt

+1 -1

@@ -4,7 +4,7 @@ How to use git-daemon

4 =====================

5

6 Git can be run in inetd mode and in stand alone mode. But all you want is

7 -let a coworker pull from you, and therefore need to set up a Git server

7 +to let a coworker pull from you, and therefore need to set up a Git server

8 real quick, right?

9

10 Note that git-daemon is not really chatty at the moment, especially when

Documentation/technical/api-simple-ipc.txt

+1 -1

@@ -20,7 +20,7 @@ IPC-client.

20

21 The IPC-client routines within a client application process connect

22 to the IPC-server and send a request message and wait for a response.

23 -When received, the response is returned back the caller.

23 +When received, the response is returned back to the caller.

24

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

Documentation/technical/partial-clone.txt

+1 -1

@@ -3,7 +3,7 @@ Partial Clone Design Notes

3

4 The "Partial Clone" feature is a performance optimization for Git that

5 allows Git to function without having a complete copy of the repository.

6 -The goal of this work is to allow Git better handle extremely large

6 +The goal of this work is to allow Git to better handle extremely large

7 repositories.

8

9 During clone and fetch operations, Git downloads the complete contents

Documentation/technical/racy-git.txt

+1 -1

@@ -11,7 +11,7 @@ write out the next tree object to be committed. The state is

11 "virtual" in the sense that it does not necessarily have to, and

12 often does not, match the files in the working tree.

13

14 -There are cases Git needs to examine the differences between the

14 +There are cases where Git needs to examine the differences between the

15 virtual working tree state in the index and the files in the

16 working tree. The most obvious case is when the user asks `git

17 diff` (or its low level implementation, `git diff-files`) or

Documentation/technical/rerere.txt

+1 -1

@@ -60,7 +60,7 @@ By resolving this conflict, to leave line D, the user declares:

60 what AB and AC wanted to do.

61

62 As branch AC2 refers to the same commit as AC, the above implies that

63 -this is also compatible what AB and AC2 wanted to do.

63 +this is also compatible with what AB and AC2 wanted to do.

64

65 By extension, this means that rerere should recognize that the above

66 conflicts are the same. To do this, the labels on the conflict

documentation: add missing words