diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-26 00:14:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-26 00:14:22 -0800 |
| commit | 2db511fdbdbe1c8aab80f4bc13f0df037bce8a33 (patch) | |
| tree | 23350997a56089356ccaeaa923a783378c198bf6 /Documentation/git-am.txt | |
| parent | b8d97d07fd5025232cae74cfc9a555abd9ac390e (diff) | |
| parent | 81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff) | |
| download | git-2db511fdbdbe1c8aab80f4bc13f0df037bce8a33.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
timezone_names[]: fixed the tz offset for New Zealand.
filter-branch documentation: non-zero exit status in command abort the filter
rev-parse: fix potential bus error with --parseopt option spec handling
Use a single implementation and API for copy_file()
Documentation/git-filter-branch: add a new msg-filter example
Correct fast-export file mode strings to match fast-import standard
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 2ffba2102b..e640fc75cd 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -138,7 +138,7 @@ aborts in the middle,. You can recover from this in one of two ways: The command refuses to process new mailboxes while `.dotest` directory exists, so if you decide to start over from scratch, -run `rm -f .dotest` before running the command with mailbox +run `rm -f -r .dotest` before running the command with mailbox names. |