commit 9a4be0af5f37aeceb4e2ac807f5e6242b3ddc515
Author: Oswald Buddenhagen <[email protected]>
Date: Sun Jan 11 14:18:34 2015 +0100
skip merges during ChangeLog generation
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5141f7c..b47edf6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ $(srcdir)/ChangeLog: log
log:
@test -z "$(srcdir)" || cd $(srcdir) && \
( ! test -d .git || \
- git log --date=iso --log-size --name-only | \
+ git log --date=iso --log-size --name-only --no-merges | \
perl -e '$(LOG_PL)' > ChangeLog )
deb: deb-clean
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
