~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stage: disable whitespace warnings from git apply when staging updates
[tig]
/
tig.c
diff --git
a/tig.c
b/tig.c
index
5c7be40
..
466fc2d
100644
(file)
--- a/
tig.c
+++ b/
tig.c
@@
-4470,7
+4470,7
@@
stage_update_chunk(struct view *view, struct line *line)
return FALSE;
if (!string_format_from(cmd, &cmdsize,
return FALSE;
if (!string_format_from(cmd, &cmdsize,
- "git apply --cached %s - && "
+ "git apply --
whitespace=nowarn --
cached %s - && "
"git update-index -q --unmerged --refresh 2>/dev/null",
stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
return FALSE;
"git update-index -q --unmerged --refresh 2>/dev/null",
stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
return FALSE;