diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-23 17:38:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-23 23:38:04 -0700 |
| commit | 1c2c6112a4bf655faa768ddfca067945edf2809e (patch) | |
| tree | 985973c2d5ac3611db6e25f702eecacf7cb41939 /Documentation/git-am.txt | |
| parent | bab36bf57d7a565e0077e1f5d2e3a10afa319ecc (diff) | |
| parent | b08bbae7e1676e5a47fa9054e268ff14ee819a3a (diff) | |
| download | git-1c2c6112a4bf655faa768ddfca067945edf2809e.tar.gz | |
Merge branch 'master' into jc/bisect
This is to merge in the fix for path-limited bisection
from the 'master' branch.
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 4fb1d84413..13a7389867 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -70,7 +70,7 @@ default. You could use `--no-utf8` to override this. the patch. -C<n>, -p<n>:: - These flag are passed to the `git-apply` program that applies + These flags are passed to the `git-apply` program that applies the patch. --interactive:: |