diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-08 18:55:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-08 18:55:50 -0700 |
| commit | 037c43c68e220739e690540de89a6d5835fefe73 (patch) | |
| tree | 3e201f833fc63e48db6983e45ce2425d884408db /Documentation/git-diff-files.txt | |
| parent | Fix "read-tree -m A B" priming the cache-tree (diff) | |
| parent | Git 1.7.2-rc2 (diff) | |
| download | tgif-037c43c68e220739e690540de89a6d5835fefe73.tar.xz | |
Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
* ko/master: (2325 commits)
Git 1.7.2-rc2
backmerge a few more fixes to 1.7.1.X series
fix git branch -m in presence of cross devices
t/t0006: specify timezone as EST5 not EST to comply with POSIX
add missing && to submodule-merge testcase
t/README: document more test helpers
test-date: fix sscanf type conversion
xdiff: optimise for no whitespace difference when ignoring whitespace.
gitweb: Move evaluate_gitweb_config out of run_request
parse_date: fix signedness in timezone calculation
t0006: test timezone parsing
rerere.txt: Document forget subcommand
t/README: proposed rewording...
t/README: Document the do's and don'ts of tests
t/README: Add a section about skipping tests
t/README: Document test_expect_code
t/README: Document test_external*
t/README: Document the prereq functions, and 3-arg test_*
t/README: Typo: paralell -> parallel
t/README: The trash is in 't/trash directory.$name'
...
Conflicts:
builtin-read-tree.c
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 4ef03578eb..9cd8ccef37 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -15,7 +15,7 @@ DESCRIPTION Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the -same as for 'git-diff-index' and 'git-diff-tree'. +same as for 'git diff-index' and 'git diff-tree'. OPTIONS ------- |