From: Felipe Contreras Date: Fri, 30 Aug 2013 05:56:15 GMT Subject: [PATCH v6 21/28] rebase: trivial cleanup Message-ID: <1377842182-18724-22-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1377842182-18724-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- git-rebase--am.sh | 1 + git-rebase.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--am.sh b/git-rebase--am.sh index aae6a85..d6a434c 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -51,6 +51,7 @@ ret=0 return $? fi + test -n "$GIT_QUIET" && git_am_opt="$git_am_opt -q" git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches" ret=$? diff --git a/git-rebase.sh b/git-rebase.sh index db2ea8d..ebe87a3 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -284,7 +284,6 @@ do ;; -q) GIT_QUIET=t - git_am_opt="$git_am_opt -q" verbose= diffstat= ;; -- 1.8.4-fc