All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olivier Marin <dkr+ml.git@free.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Theodore Tso" <tytso@mit.edu>,
	"Nanako Shiraishi" <nanako3@lavabit.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
	"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: Sat, 19 Jul 2008 21:49:33 +0200	[thread overview]
Message-ID: <4882454D.2080500@free.fr> (raw)
In-Reply-To: <7viqv5r637.fsf@gitster.siamese.dyndns.org>

Junio C Hamano a écrit :
> Theodore Tso <tytso@mit.edu> writes:
> 
>> 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?
> 
> This does not seem to have reached the list nor its archives.  I cannot
> say I have really looked at it deeply but it may be a good starting
> point.  It needs docs ;-)

Thinking about the way "git am" works:

It tries to apply patches even on a dirty tree which makes difficult
to automatically do a "git reset --hard" with --skip or --abort and
forces the user to clean the index by hand if last patch failed with
unmerged files.

So, do some people still use "git am" with a dirty tree or will a
patch that make it work like "git rebase" be accepted?

I think users can use "git stash" and "git stash pop" today. Did I
miss something?

Note: the version that use "git sequencer" seems to work like I want
      but I do not know if it is a side effect or not.

Olivier.

  parent reply	other threads:[~2008-07-19 19:50 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
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           ` Olivier Marin [this message]
2008-07-19 19:59             ` [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" 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=4882454D.2080500@free.fr \
    --to=dkr+ml.git@free.fr \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jari.aalto@cante.net \
    --cc=joe@faithfulgeek.org \
    --cc=nanako3@lavabit.com \
    --cc=rene.scharfe@lsrfire.ath.cx \
    --cc=s-beyer@gmx.net \
    --cc=tytso@mit.edu \
    /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.