From 7cc72ca00b6b1b17ae2113fa254eed63cc64fe99 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 19 Jul 2013 10:21:31 -0700 Subject: [PATCH] Meta/Reintegrate: ignroe whitespace when comparing list of topics Often topics that are ready to advance are marked by indenting them before moving. Ignore these changes when comparing. --- Reintegrate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Reintegrate b/Reintegrate index 0266e712f4..45e384c0aa 100755 --- a/Reintegrate +++ b/Reintegrate @@ -267,7 +267,7 @@ then generate "$0" "$@" elif test -z "$diff" then - generate "$0" "$@" | diff -u "$update" - + generate "$0" "$@" | diff -w -u "$update" - if test $? = 0 then echo >&2 "No changes." @@ -283,5 +283,5 @@ then esac fi else - generate "$0" "$@" | diff -u "$update" - + generate "$0" "$@" | diff -w -u "$update" - fi -- 2.11.4.GIT