summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-16 15:33:01 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-18 11:54:48 -0700
commit0e987a12fc1d481d81ad9c56f4714efb08667213 (patch)
tree3558298ec717c32ddac1204e6c9f751ab0da4d38 /ll-merge.c
parent2e6a30ef8fbaedc5f2ee199d36f7256bb0cfdf1e (diff)
downloadgit-0e987a12fc1d481d81ad9c56f4714efb08667213.tar.gz
am, rebase: teach quiet option
git-am and git-rebase are talkative scripts. Teach them to be quiet when told, allowing them to speak only when they fail or experience errors. The quiet option is maintained when git-am or git-rebase fails to apply a patch. This means subsequent --resolved, --continue, --skip, --abort invocations will be quiet if the original invocation was quiet. Drop a handful of >&2 redirection; the rest of the program sends all the info messages to stdout, not to stderr. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions