projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Added a few examples to git-pull man page.
[git.git]
/
ls-files.c
diff --git
a/ls-files.c
b/ls-files.c
index
3085b2f
..
d9c8b21
100644
(file)
--- a/
ls-files.c
+++ b/
ls-files.c
@@
-97,7
+97,7
@@
static int add_excludes_from_file_1(const char *fname,
for (i = 0; i < size; i++) {
if (buf[i] == '\n') {
if (entry != buf + i && entry[0] != '#') {
- buf[i] = 0;
+ buf[i
- (i && buf[i-1] == '\r')
] = 0;
add_exclude(entry, base, baselen, which);
}
entry = buf + i + 1;