diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-07 17:27:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-07 17:27:09 -0700 |
| commit | ab1b3af7925682e0375667b892e2f7e985effba5 (patch) | |
| tree | 3f2cdfe4fc3f15e385cf9ba00f06dc6bddf80943 /Documentation/git-apply.txt | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Documentation: git aliases (diff) | |
| download | tgif-ab1b3af7925682e0375667b892e2f7e985effba5.tar.xz | |
Merge branch 'master' into next
* master:
Documentation: git aliases
git-cvsserver asciidoc formatting tweaks
config.txt grammar, typo, and asciidoc fixes
Documentation: git-ls-tree (typofix)
Document git-ls-tree --fullname
Document git aliases support
make clean: remove dist-doc targets.
Misc doc improvements
Documentation: add missing docs make check-docs found.
Some doc typo fixes
Off-by-one error in get_path_prefix(), found by Valgrind
gitk: Re-read the descendent/ancestor tag & head info on update
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 9cc7c74dea..2ff74949a7 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -76,7 +76,7 @@ OPTIONS -C<n>:: Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding - context exist they all most match. By default no context is + context exist they all must match. By default no context is ever ignored. --apply:: |