From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olivier Marin Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" Date: Sat, 19 Jul 2008 20:40:11 +0200 Message-ID: <4882350B.6020003@free.fr> References: <73fd69b50807151408i6a916da6p7b89fe81e65fc717@mail.gmail.com> <20080715212211.GL6244@leksak.fem-net> <487D1B3D.70500@lsrfire.ath.cx> <20080716012619.GM8185@mit.edu> <7viqv5r637.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Theodore Tso , Nanako Shiraishi , Johannes Schindelin , =?ISO-8859-1?Q?Ren=E9_Scharfe?= , Stephan Beyer , Joe Fiorini , git@vger.kernel.org, Jari Aalto To: Junio C Hamano X-From: git-owner@vger.kernel.org Sat Jul 19 20:41:31 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KKHMx-0006Ty-Fa for gcvg-git-2@gmane.org; Sat, 19 Jul 2008 20:41:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755478AbYGSSkS convert rfc822-to-quoted-printable (ORCPT ); Sat, 19 Jul 2008 14:40:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755204AbYGSSkQ (ORCPT ); Sat, 19 Jul 2008 14:40:16 -0400 Received: from smtp2-g19.free.fr ([212.27.42.28]:52482 "EHLO smtp2-g19.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754263AbYGSSkO (ORCPT ); Sat, 19 Jul 2008 14:40:14 -0400 Received: from smtp2-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp2-g19.free.fr (Postfix) with ESMTP id 29EFE12B6D1; Sat, 19 Jul 2008 20:40:13 +0200 (CEST) Received: from [10.253.21.40] (hhe95-1-82-225-56-14.fbx.proxad.net [82.225.56.14]) by smtp2-g19.free.fr (Postfix) with ESMTP id 54AD012B6D0; Sat, 19 Jul 2008 20:40:12 +0200 (CEST) User-Agent: Thunderbird 2.0.0.14 (X11/20080505) In-Reply-To: <7viqv5r637.fsf@gitster.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano a =E9crit : > Theodore Tso writes: >=20 >> While you have "git am" open, how about adding an "git am --abort" >> which nukes the .dotest aka .git/rebase directory, and resets HEAD >> back to the original position? >=20 > This does not seem to have reached the list nor its archives. I cann= ot > say I have really looked at it deeply but it may be a good starting > point. It needs docs ;-) This can be squashed to Nanako's path: it adds missing docs, 'git rerere clear' and move $dotest deletion at the end in case 'git read-tree' failed (because of a dirty index). Olivier. -- >8 -- Subject: [PATCH] git am --abort To squash. Signed-off-by: Olivier Marin --- Documentation/git-am.txt | 5 ++++- git-am.sh | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 2d7f162..e010a16 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -13,7 +13,7 @@ SYNOPSIS [--3way] [--interactive] [--binary] [--whitespace=3D