From: David Aguilar <davvid@gmail.com>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Tanguy Ortolo <tanguy+debian@ortolo.eu>,
Charles Bailey <charles@hashpling.org>
Subject: Re: [PATCH 1/4] difftool--helper: Make style consistent with git
Date: Thu, 18 Aug 2011 02:08:12 -0700 [thread overview]
Message-ID: <20110818090810.GA15416@gmail.com> (raw)
In-Reply-To: <CAHGBnuPRsh0WDVSFr0X1Y+nb=94pJVv8=evFQCjdcd_y9ux97A@mail.gmail.com>
On Thu, Aug 18, 2011 at 09:49:33AM +0200, Sebastian Schuberth wrote:
> On Thu, Aug 18, 2011 at 09:23, David Aguilar <davvid@gmail.com> wrote:
>
> > Use the predominant conditional style where "then" appears
> > alone on the line after the test expression.
>
> I support your effort to unify the style, but for my personal taste it
> has gone the wrong way :-) Even if "then" on its own line was the
> predominant style in the merge scripts, I would have voted for putting
> all "then" in the same line as "if" as I find this easier to read and
> comprehend. But then again it's obvious that such a change would
> polarize ;-)
>
> --
> Sebastian Schuberth
I am fine reworking it either way.
There's not a specific note about it in
Documentation/CodingStyle.
If someone wants to make the final call I can patch the docs
and rework these patches as needed.
Thanks,
--
David
next prev parent reply other threads:[~2011-08-18 9:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 7:23 [PATCH 0/4] Refactor git-mergetool--lib.sh David Aguilar
2011-08-18 7:23 ` [PATCH 1/4] difftool--helper: Make style consistent with git David Aguilar
2011-08-18 7:49 ` Sebastian Schuberth
2011-08-18 9:08 ` David Aguilar [this message]
2011-08-18 17:31 ` Junio C Hamano
2011-08-18 7:23 ` [PATCH 2/4] mergetool--lib: " David Aguilar
2011-08-18 7:23 ` [PATCH 3/4] mergetool--lib: Refactor tools into separate files David Aguilar
2011-10-09 9:17 ` [PATCH da/difftool-mergtool-refactor] Makefile: fix permissions of mergetools/ checked out with permissive umask Jonathan Nieder
2011-10-09 11:43 ` Jonathan Nieder
2011-10-09 18:26 ` David Aguilar
2011-10-09 21:47 ` Jonathan Nieder
2011-10-11 0:00 ` Junio C Hamano
2011-08-18 7:23 ` [PATCH 4/4] mergetools/meld: Use '--output' when available David Aguilar
2011-08-18 8:13 ` Jonathan Nieder
2011-08-18 9:24 ` David Aguilar
2011-08-19 9:14 ` [PATCH v2 " David Aguilar
2011-08-19 22:58 ` Junio C Hamano
2011-08-18 7:57 ` [PATCH 0/4] Refactor git-mergetool--lib.sh Sebastian Schuberth
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=20110818090810.GA15416@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sschuberth@gmail.com \
--cc=tanguy+debian@ortolo.eu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).