projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2c2ef35
)
further refine check-conflicts to avoid false positives
author
ivan
<ivan>
Wed, 15 Jun 2011 02:38:25 +0000
(
02:38
+0000)
committer
ivan
<ivan>
Wed, 15 Jun 2011 02:38:25 +0000
(
02:38
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
b9afd42
..
bb99a7b
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...