From: Junio C Hamano <junkio@cox.net>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
Date: Thu, 27 Jul 2006 21:48:49 -0700 [thread overview]
Message-ID: <7vr706mj0u.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060728025619.GK13776@pasky.or.cz> (Petr Baudis's message of "Fri, 28 Jul 2006 04:56:19 +0200")
Petr Baudis <pasky@suse.cz> writes:
> Dear diary, on Fri, Jul 28, 2006 at 04:41:04AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> said that...
>> Petr Baudis <pasky@suse.cz> writes:
>> > (iv) I need git-apply to add/remove to/from index new/gone files,
>> > while at the same time...
>> >
>> > (v) I want to allow applying of patches to working copy that is not
>> > completely clean, even on top of modified files
>>
>> You probably should be able to talk me into doing these, but
>> doesn't it already do (iv) and (v)?
>
> Well, at once? I can do (iv) by adding --index but that contradicts (v).
> But maybe I'm missing something.
What should the semantics of such operation be? Apply to index
on paths that are clean while leave the index entries untouched
for paths that are dirty? What should happen on renamed paths
that are dirty?
next prev parent reply other threads:[~2006-07-28 4:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-26 17:41 [PATCH 1/2] t7001: add test for git-mv dir1 dir2/ Johannes Schindelin
2006-07-26 17:50 ` Jon Smirl
2006-07-26 18:23 ` Junio C Hamano
2006-07-26 18:31 ` Jon Smirl
2006-07-26 18:58 ` Junio C Hamano
2006-07-26 19:31 ` Junio C Hamano
2006-07-26 20:33 ` Jon Smirl
2006-07-26 18:47 ` Johannes Schindelin
2006-07-26 18:39 ` Josef Weidendorfer
2006-07-26 19:05 ` Junio C Hamano
2006-07-28 1:30 ` Petr Baudis
2006-07-28 2:41 ` Junio C Hamano
2006-07-28 2:56 ` Petr Baudis
2006-07-28 4:48 ` Junio C Hamano [this message]
2006-07-28 15:47 ` Petr Baudis
2006-07-28 10:14 ` [PATCH] Teach git-apply about '-R' Johannes Schindelin
2006-07-28 15:14 ` Linus Torvalds
2006-07-28 15:46 ` [PATCH v2] " Johannes Schindelin
2006-07-28 15:36 ` [PATCH] " Junio C Hamano
2006-07-28 15:50 ` Johannes Schindelin
2006-07-28 19:20 ` Junio C Hamano
2006-07-28 19:36 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr706mj0u.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).