-p, -u, --patch | Generate patch |
-s, --no-patch | Suppress diff output. Useful for commands like git show that show the patch by default, or to cancel the effect of --patch |
--raw | Generate the diff in raw format |
--diff-algorithm= | Choose a diff algorithm. The variants are as follows: myers , minimal , patience , histogram |
--summary | Output a condensed summary of extended header information such as creations, renames and mode changes |
--name-only | Show only names of changed files |
--name-status | Show names and statuses of changed files The most common statuses are M (Modified), A (Added), and D (Deleted) |
--check | Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code |
--full-index | Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output |
--binary | In addition to --full-index , output a binary diff that can be applied with git apply |
-a, --text | Treat all files as text. |
--color | Set the color mode; i.e. use --color=always if you would like to pipe a diff to less and keep git's coloring |