diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /Documentation/git.txt | |
parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz |
Merge remote branch 'remotes/trast-doc/for-next'
* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"
Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r-- | Documentation/git.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index b6df39ba36..8c5f5b05cb 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -575,8 +575,8 @@ other linkgit:git-config[1]. 'GIT_SSH':: - If this environment variable is set then 'git-fetch' - and 'git-push' will use this command instead + If this environment variable is set then 'git fetch' + and 'git push' will use this command instead of 'ssh' when they need to connect to a remote system. The '$GIT_SSH' command will be given exactly two arguments: the 'username@host' (or just 'host') from the URL and the @@ -592,8 +592,8 @@ for further details. 'GIT_FLUSH':: If this environment variable is set to "1", then commands such - as 'git-blame' (in incremental mode), 'git-rev-list', 'git-log', - and 'git-whatchanged' will force a flush of the output stream + as 'git blame' (in incremental mode), 'git rev-list', 'git log', + and 'git whatchanged' will force a flush of the output stream after each commit-oriented record have been flushed. If this variable is set to "0", the output of these commands will be done using completely buffered I/O. If this environment variable is |