projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b7a468
)
further refine check-conflicts to avoid false positives
author
ivan
<ivan>
Wed, 15 Jun 2011 02:40:10 +0000
(
02:40
+0000)
committer
ivan
<ivan>
Wed, 15 Jun 2011 02:40:10 +0000
(
02:40
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
bb99a7b
..
f743797
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-409,7
+409,7
@@
clean:
make clean
check-conflicts:
make clean
check-conflicts:
- ! grep -r --exclude='*config.log
.*' '--exclude=*config.status.*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler.
*' '^=======$$' .
+ ! grep -r --exclude='*config.log
*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler
*' '^=======$$' .
#these are probably only useful if you're me...
#these are probably only useful if you're me...