diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:07 +0900 |
| commit | 5da4847dccdf8df26f0cfbcc278034a62dbc97e0 (patch) | |
| tree | 28772809fb164c3368790a7557dc84c72fcb254e /wt-status.h | |
| parent | Merge branch 'js/use-bug-macro' (diff) | |
| parent | add status config and command line options for rename detection (diff) | |
| download | tgif-5da4847dccdf8df26f0cfbcc278034a62dbc97e0.tar.xz | |
Merge branch 'bp/status-rename-config'
"git status" learned to honor a new status.renames configuration to
skip rename detection, which could be useful for those who want to
do so without disabling the default rename detection done by the
"git diff" command.
* bp/status-rename-config:
add status config and command line options for rename detection
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h index 430770b854..1673d146fa 100644 --- a/wt-status.h +++ b/wt-status.h @@ -89,7 +89,9 @@ struct wt_status { int show_stash; int hints; enum ahead_behind_flags ahead_behind_flags; - + int detect_rename; + int rename_score; + int rename_limit; enum wt_status_format status_format; unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */ |