From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 0/3] mergetool/difftool cleanup
Date: Thu, 20 Nov 2014 17:20:26 -0800 [thread overview]
Message-ID: <1416532829-68662-1-git-send-email-davvid@gmail.com> (raw)
This is a cleanup series to remove the use of the $status
global variable in mergetool/difftool.
This should wait until after the current RC series is
over but figured I'd send it out.
David Aguilar (3):
mergetool--lib: remove use of $status global
difftool--helper: add explicit exit statement
mergetool: simplify conditionals
git-difftool--helper.sh | 2 ++
git-mergetool--lib.sh | 20 +++++---------------
git-mergetool.sh | 16 +++++-----------
3 files changed, 12 insertions(+), 26 deletions(-)
--
2.2.0.rc2.26.g3e3388f
next reply other threads:[~2014-11-21 1:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 1:20 David Aguilar [this message]
2014-11-21 1:20 ` [PATCH 1/3] mergetool--lib: remove use of $status global David Aguilar
2014-11-21 19:16 ` Junio C Hamano
2014-11-21 1:20 ` [PATCH 2/3] difftool--helper: add explicit exit statement David Aguilar
2014-11-21 1:20 ` [PATCH 3/3] mergetool: simplify conditionals David Aguilar
2014-11-21 9:03 ` [PATCH] mergetools: stop setting $status in merge_cmd() David Aguilar
2014-11-21 19:28 ` [PATCH 0/3] mergetool/difftool cleanup Junio C Hamano
2014-11-22 0:20 ` David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416532829-68662-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.