diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
| commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
| tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-apply.txt | |
| parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
| download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-apply.txt b/git-apply.txt index 76277bd17..c8347637d 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -73,7 +73,8 @@ OPTIONS When a pure mode change is encountered (which has no index information), the information is read from the current index instead. --R, --reverse:: +-R:: +--reverse:: Apply the patch in reverse. --reject:: @@ -124,7 +125,8 @@ discouraged. the result with this option, which would apply the deletion part but not addition part. ---allow-binary-replacement, --binary:: +--allow-binary-replacement:: +--binary:: Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary @@ -169,7 +171,8 @@ behavior: correctly. This option adds support for applying such patches by working around this bug. --v, --verbose:: +-v:: +--verbose:: Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported. |