提交 aefa4a5b 编写于 作者: L Linus Torvalds

git-apply: take "--apply" flag to force an apply even if we also ask for a diffstat

Also, remove debugging statement about applying a fragment at an offset.
上级 5fca669f
......@@ -860,7 +860,6 @@ static int find_offset(const char *buf, unsigned long size, const char *fragment
n = (i >> 1)+1;
if (i & 1)
n = -n;
fprintf(stderr, "Fragment applied at offset %d\n", n);
return try;
}
......@@ -1434,6 +1433,10 @@ int main(int argc, char **argv)
check_index = 1;
continue;
}
if (!strcmp(arg, "--apply")) {
apply = 1;
continue;
}
if (!strcmp(arg, "--show-files")) {
show_files = 1;
continue;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册