From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: Re: [1.8.0] use 'stage' term consistently Date: Sun, 6 May 2012 23:16:37 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org, Junio C Hamano , Jonathan Nieder , Jeff King , Scott Chacon , Paolo Ciarrocchi , =?UTF-8?Q?Jakub_Nar=C4=99bski?= , Johannes Schindelin , Piotr Krukowiecki To: Matthieu Moy X-From: git-owner@vger.kernel.org Sun May 06 23:16:50 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SR8ow-0000oy-Fi for gcvg-git-2@plane.gmane.org; Sun, 06 May 2012 23:16:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754704Ab2EFVQj convert rfc822-to-quoted-printable (ORCPT ); Sun, 6 May 2012 17:16:39 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:46655 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754679Ab2EFVQi convert rfc822-to-8bit (ORCPT ); Sun, 6 May 2012 17:16:38 -0400 Received: by eekc41 with SMTP id c41so1248188eek.19 for ; Sun, 06 May 2012 14:16:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=38VmK5/qjvwk3+RCzx4D0V5qn56isAo6mv2ErmHfCbU=; b=Wnrbg9M7K/aH2xby+IU33gmtVbBZVYw7Mhwb1fLLLw+xs+GEJUEh8eAOT4MXg/lDcF mtlu+L2lvxhQaUIrCgzgKWwmEXrdtjkKf7i4gq09dOcdv00OwRuN4jiZzB2Ee8fZT7t3 GC92vKqghsW3uDsAVv4xVaRGsqLFB6YUyqR/CfnQZmxAwjn+n4hYAtRTyYMB0h/3xJJL O1cYMhdMGn8E00MPYRPML9gbpcsmfpFzUidXWNvFqD8taMyXI+CstMd2jBfpNtKZWYwS 7DNWiXoQEtSR+p0KWehR+e3lP4rmtImJZu11R+58F2Xz537KOEMj/KaQvZzOGU1xyJOe U5bA== Received: by 10.213.107.193 with SMTP id c1mr2306956ebp.120.1336338997516; Sun, 06 May 2012 14:16:37 -0700 (PDT) Received: by 10.213.103.18 with HTTP; Sun, 6 May 2012 14:16:37 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Sun, May 6, 2012 at 12:26 PM, Matthieu Moy wrote: > Felipe Contreras writes: > * Currenly, "index" and "staging area" are not exactly synonyms. When > =C2=A0used with "git add" and "git commit" (without -a), the index is= the > =C2=A0staging area for the next commit. But when used by "git merge",= the > =C2=A0index is more a "merging area". And what is the difference? The result of the 'merging area' is still a= commit. > About the name, an alternative to "stage" was suggested earlier: > "precommit". If we were to rewrite Git from scratch, I'd argue in fav= or > of this one, which is really easy to understand, especially for > non-native (you really need to know what a "commit" is to use Git, an= d > then infering the meaning of precommit is easy). But we probably have > already a too long history of changing the name, so introducing yet > another one is perhaps counter-productive. I don't know. I don't know, precommit is not an English word, and it was discussed before, but not many people vouched for it. Plus, it's not already widely used in the interwebs documentation as staging area is. Cheers. --=20 =46elipe Contreras