diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:47:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:47:10 -0800 |
| commit | 1a02a85d63f280ffaec6977ed2365be92cb80287 (patch) | |
| tree | fc0cb889551b7c6f297a7a72508357397a4de451 /Documentation/git-merge.txt | |
| parent | Merge branch 'tr/filter-branch' (diff) | |
| parent | format-patch: Add "--no-stat" as a synonym for "-p" (diff) | |
| download | tgif-1a02a85d63f280ffaec6977ed2365be92cb80287.tar.xz | |
Merge branch 'bg/format-patch-doc-update'
* bg/format-patch-doc-update:
format-patch: Add "--no-stat" as a synonym for "-p"
format-patch documentation: Fix formatting
format-patch documentation: Remove diff options that are not useful
format-patch: Always generate a patch
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions