From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 580 invoked by alias); 7 Dec 2012 15:44:04 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 30857 Received: (qmail 5068 invoked from network); 7 Dec 2012 15:44:00 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,T_TO_NO_BRKTS_FREEMAIL autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at free.fr does not designate permitted sender hosts) Message-ID: <50C20D46.4080800@free.fr> Date: Fri, 07 Dec 2012 16:37:42 +0100 From: =?ISO-8859-1?Q?Fran=E7ois_Revol?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.11) Gecko/20121122 Icedove/10.0.11 MIME-Version: 1.0 To: zsh-workers@zsh.org Subject: Re: Access to CVS References: <20121204225059.GA9935@redoubt.spodhuis.org> <26711.1354667636@thecus.kiddle.eu> <20121205031447.GA26262@redoubt.spodhuis.org> <121205014000.ZM22819@torch.brasslantern.com> <20121205112647.GA34241@redoubt.spodhuis.org> <20121205195013.64ef36c0@pws-pc.ntlworld.com> <20121207000521.GD20703@pug.qqx.org> <20121207151146.GB17167@pug.qqx.org> In-Reply-To: <20121207151146.GB17167@pug.qqx.org> X-Enigmail-Version: 1.4.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit On 07/12/2012 16:11, Aaron Schrab wrote: > Also, this would not be convenient for the submitter of the pull > request. If a normal merge is done, it is easy for the submitter (or > other people) to determine that the branch was fully merged, since the > submitted commits are part of the history. With --squash, if the > submitter wants to determine if the changes were merged as-is or if > further modifications were done a more thorough examination would need > to be done, especially if the merge was done on top of a different > commit than where the original branch was based. Well you can merge back master into your branch, then git diff master will tell if there are still differences... But it's unhandy. François.