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-whatchanged.txt | |
parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.xz |
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-whatchanged.txt')
-rw-r--r-- | Documentation/git-whatchanged.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index cadfbd904..ea753cdaf 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -13,8 +13,8 @@ SYNOPSIS DESCRIPTION ----------- Shows commit logs and diff output each commit introduces. The -command internally invokes 'git-rev-list' piped to -'git-diff-tree', and takes command line options for both of +command internally invokes 'git rev-list' piped to +'git diff-tree', and takes command line options for both of these commands. This manual page describes only the most frequently used options. |