diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:41 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:41 -0400 |
| commit | 160314e62537274d88c939bed957f623cda13da4 (patch) | |
| tree | a5d8240095a1968922c9dbe4336915547b91754a /diff.h | |
| parent | 63bba4fdd86d80ef061c449daa97a981a9be0792 (diff) | |
| parent | 0d32ae8d7ffab444a83ce1db11e5341a95d109dd (diff) | |
| download | git-160314e62537274d88c939bed957f623cda13da4.tar.gz | |
Merge branch 'jz/patch-id'
A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* jz/patch-id:
builtin: patch-id: remove unused diff-tree prefix
builtin: patch-id: add --verbatim as a command mode
patch-id: fix patch-id for mode changes
builtin: patch-id: fix patch-id with binary diffs
patch-id: use stable patch-id for rebases
patch-id: fix stable patch id for binary / header-only
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -634,7 +634,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, unsigned int option); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int); void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); int diff_result_code(struct diff_options *, int); |