projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up git-diff-tree 'header' generation
[git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
31f134c
..
c81b0a2
100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-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;
n = (i >> 1)+1;
if (i & 1)
n = -n;
- fprintf(stderr, "Fragment applied at offset %d\n", n);
return try;
}
return try;
}
@@
-1434,6
+1433,10
@@
int main(int argc, char **argv)
check_index = 1;
continue;
}
check_index = 1;
continue;
}
+ if (!strcmp(arg, "--apply")) {
+ apply = 1;
+ continue;
+ }
if (!strcmp(arg, "--show-files")) {
show_files = 1;
continue;
if (!strcmp(arg, "--show-files")) {
show_files = 1;
continue;