~mdw
/
tig
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbbd7f6
)
stage: disable whitespace warnings from git apply when staging updates
author
Jonas Fonseca
<fonseca@diku.dk>
Mon, 31 Mar 2008 11:03:45 +0000
(13:03 +0200)
committer
Jonas Fonseca
<fonseca@diku.dk>
Mon, 31 Mar 2008 11:03:45 +0000
(13:03 +0200)
tig.c
patch
|
blob
|
blame
|
history
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,
- "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;