diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-12 22:00:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-12 22:00:16 (GMT) |
| commit | ba1edc92646ec0adf392542ad94fcafe5636f7c2 (patch) | |
| tree | 23214b745c24c89052f8be8027a6f41af77735c2 /Documentation | |
| parent | 417a5b226ca70086a7a54bbb0914db53c32384c5 (diff) | |
| parent | 0cef4e765c10118f6e33dd770a475b9cd89a7960 (diff) | |
| download | git-ba1edc92646ec0adf392542ad94fcafe5636f7c2.zip git-ba1edc92646ec0adf392542ad94fcafe5636f7c2.tar.gz git-ba1edc92646ec0adf392542ad94fcafe5636f7c2.tar.bz2 | |
Merge branch 'rw/apply-does-not-take-ignore-date' into maint
* rw/apply-does-not-take-ignore-date:
git-am.txt: --ignore-date flag is not passed to git-apply
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 9adce37..d4ef16c 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -83,7 +83,6 @@ default. You can use `--no-utf8` to override this. it is supposed to apply to and we have those blobs available locally. ---ignore-date:: --ignore-space-change:: --ignore-whitespace:: --whitespace=<option>:: |