All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Tso <tytso@mit.edu>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
	gitster@pobox.com, "Stephan Beyer" <s-beyer@gmx.net>,
	"Joe Fiorini" <joe@faithfulgeek.org>,
	git@vger.kernel.org, "Jari Aalto" <jari.aalto@cante.net>
Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Date: Tue, 15 Jul 2008 21:26:19 -0400	[thread overview]
Message-ID: <20080716012619.GM8185@mit.edu> (raw)
In-Reply-To: <alpine.DEB.1.00.0807160245440.2841@eeepc-johanness>

On Wed, Jul 16, 2008 at 02:47:33AM +0200, Johannes Schindelin wrote:
> 
> Since the files generated and used during a rebase are never to be
> tracked, they should live in $GIT_DIR.  While at it, avoid the rather
> meaningless term "dotest" to "rebase", and unhide ".dotest-merge".
> 
> This was wished for on the mailing list, but so far unimplemented.

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?

And another nice shortcut would be "git am --forceapply" which applies
the patch, leaving .rej files for the user to resolve by hand.  That
makes it easier for the user to manually run patch while passing a
filename in .dotest aka .git/rebase.

These two additions would make the git-am workflow much smoother.

Regards,

					- Ted

  parent reply	other threads:[~2008-07-16  1:27 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-15 21:08 Git rebase failure: .dotest overwritten Joe Fiorini
2008-07-15 21:22 ` Stephan Beyer
2008-07-15 21:48   ` René Scharfe
2008-07-16  0:47     ` [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" Johannes Schindelin
2008-07-16  0:57       ` Linus Torvalds
2008-07-16  1:10       ` Junio C Hamano
2008-07-16  1:15         ` Johannes Schindelin
2008-07-16  1:19           ` Junio C Hamano
2008-07-16  1:33             ` [PATCH for master] " Johannes Schindelin
2008-07-16  1:52           ` [PATCH] " Linus Torvalds
2008-07-16  2:30             ` Johannes Schindelin
2008-07-16  3:05               ` Junio C Hamano
2008-07-16 21:27           ` Petr Baudis
2008-07-16 21:44             ` Junio C Hamano
2008-07-16  1:26       ` Theodore Tso [this message]
2008-07-16  1:47         ` Stephan Beyer
2008-07-16 19:18         ` Junio C Hamano
2008-07-19 18:40           ` Olivier Marin
2008-07-19 22:18             ` Junio C Hamano
2008-07-19 22:27               ` Junio C Hamano
2008-07-22 23:47               ` Stephan Beyer
2008-07-23  0:48                 ` Junio C Hamano
2008-07-23  1:13                   ` Stephan Beyer
2008-07-23 14:54                     ` Olivier Marin
2008-07-23 16:47                       ` Stephan Beyer
2008-07-23 20:40                     ` Junio C Hamano
2008-07-23  0:10             ` [PATCH] am --abort: Add to bash-completion and mention in git-rerere documentation Stephan Beyer
2008-07-19 19:49           ` [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" Olivier Marin
2008-07-19 19:59             ` Stephan Beyer
2008-07-19 20:25               ` Olivier Marin
2008-07-19 21:52             ` Junio C Hamano
2008-07-19 22:39               ` Jakub Narebski
2008-07-21 13:39               ` Olivier Marin
2008-07-23  0:16                 ` Junio C Hamano
2008-07-23 12:24                   ` Olivier Marin
2008-07-23 18:31                     ` Junio C Hamano
2008-07-24 12:44                       ` Olivier Marin

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=20080716012619.GM8185@mit.edu \
    --to=tytso@mit.edu \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jari.aalto@cante.net \
    --cc=joe@faithfulgeek.org \
    --cc=rene.scharfe@lsrfire.ath.cx \
    --cc=s-beyer@gmx.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.