From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Andrew Ardill <andrew.ardill@gmail•com>,
Christoph Paulik <cpaulik@gmail•com>,
"git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: [PATCH 1/2] merge: do not contaminate option_commit with --squash
Date: Wed, 27 Apr 2016 08:14:24 -0700 [thread overview]
Message-ID: <xmqqeg9raxtb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1604270846200.2896@virtualbox> (Johannes Schindelin's message of "Wed, 27 Apr 2016 08:46:38 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:
>> * Just a preliminary clean-up for the next one which is on topic.
>
> I think it would make for a nice cleanup anyways.
There is a missing open-brace that causes a compilation error,
though ;-)
next prev parent reply other threads:[~2016-04-27 15:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 21:10 git merge branch --no-commit does commit fast forward merges Christoph Paulik
2016-04-17 23:52 ` Jacob Keller
2016-04-18 6:26 ` Johannes Schindelin
2016-04-18 7:09 ` Andrew Ardill
2016-04-18 7:23 ` Christoph Paulik
2016-04-18 7:44 ` Andrew Ardill
2016-04-18 16:36 ` Junio C Hamano
2016-04-18 16:54 ` Junio C Hamano
2016-04-26 21:32 ` [PATCH 1/2] merge: do not contaminate option_commit with --squash Junio C Hamano
2016-04-27 6:46 ` Johannes Schindelin
2016-04-27 15:14 ` Junio C Hamano [this message]
2016-04-27 15:19 ` Johannes Schindelin
2016-04-26 21:37 ` [PATCH 2/2] merge: warn --no-commit merge when no new commit is created Junio C Hamano
2016-04-26 21:53 ` Stefan Beller
2016-04-26 22:00 ` Junio C Hamano
2016-04-27 1:39 ` Eric Sunshine
2016-04-27 5:57 ` Johannes Sixt
2016-04-27 6:50 ` Johannes Schindelin
2016-04-27 15:13 ` Junio C Hamano
2016-04-27 15:37 ` Johannes Schindelin
2016-04-27 16:02 ` Junio C Hamano
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=xmqqeg9raxtb.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=andrew.ardill@gmail$(echo .)com \
--cc=cpaulik@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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