From: Olivier Marin <dkr+ml.git@free.fr>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Theodore Tso" <tytso@mit.edu>,
"Nanako Shiraishi" <nanako3@lavabit.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"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 22:25:48 +0200 [thread overview]
Message-ID: <48824DCC.7090405@free.fr> (raw)
In-Reply-To: <20080719195944.GB5792@leksak.fem-net>
Stephan Beyer a écrit :
>
> If you mean with "work like I want" that it complains about an unclean
> work tree: the check is explicitly done by git-sequencer.
Yes, I mean: refuse to work if the tree is not clean _and_ --skip
and --abort clean the index/tree for me.
With current git version "git am --skip" refuse to continue with a
message: "Dirty index: cannot apply patches (dirty: ...)", if some
files stay unmerged.
As a user I find --skip and --abort useless^Wpainful to use in this
situation.
> I guess there are situations where you want to apply a patch on a dirty
> work tree, e.g. if you fixed some tiny issues so that patches can
> apply cleanly.
Maybe.
Olivier.
next prev parent reply other threads:[~2008-07-19 20:28 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 ` [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 [this message]
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=48824DCC.7090405@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.