From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Handling merge conflicts a bit more gracefully..
Date: Wed, 8 Jun 2005 17:41:56 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0506081738000.2286@ppc970.osdl.org> (raw)
In-Reply-To: <7vzmu01jmc.fsf@assigned-by-dhcp.cox.net>
On Wed, 8 Jun 2005, Junio C Hamano wrote:
>
> I do not think you can, unless you are willing to parse shell
> error messages, which I do not want you to be willing to ;-).
Yeah, no.
> I think you have a bigger problem of leading paths, BTW.
Gotcha. I committed a largely untested fix that hopefully does this all
right.
I'm currently using your suggested thing (inside a function), but I think
I'll instead make it do
git-update-cache --add --cacheinfo ... &&
git-checkout-cache -u -f "$4"
which seems even simpler.
Linus
next prev parent reply other threads:[~2005-06-09 0:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-08 20:55 Handling merge conflicts a bit more gracefully Linus Torvalds
2005-06-08 23:07 ` Junio C Hamano
2005-06-08 23:35 ` Linus Torvalds
2005-06-09 0:03 ` Junio C Hamano
2005-06-09 0:41 ` Linus Torvalds [this message]
2005-06-09 1:04 ` Junio C Hamano
2005-06-09 0:11 ` Junio C Hamano
2005-06-09 1:08 ` Linus Torvalds
2005-06-09 2:15 ` Junio C Hamano
2005-06-09 2:48 ` Linus Torvalds
2005-06-09 4:35 ` Junio C Hamano
2005-06-09 4:54 ` Linus Torvalds
2005-06-09 5:15 ` Junio C Hamano
2005-06-09 7:02 ` [PATCH 0/3] " Junio C Hamano
2005-06-09 7:04 ` [PATCH 1/3] read-tree.c: rename local variables used in 3-way merge code Junio C Hamano
2005-06-09 7:05 ` [PATCH 2/3] read-tree -m 3-way: loosen index requirements that is too strict Junio C Hamano
2005-06-09 7:06 ` [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-09 15:15 ` Linus Torvalds
2005-06-09 17:26 ` Junio C Hamano
2005-06-09 17:37 ` Linus Torvalds
[not found] ` <7vbr6fnzf0.fsf@assigned-by-dhcp.cox.net>
[not found] ` <Pine.LNX.4.58.0506091152530.2286@ppc970.osdl.org>
2005-06-09 22:45 ` [PATCH] read-tree.c: rename local variables used in 3-way merge code Junio C Hamano
2005-06-09 22:47 ` [PATCH] Handle entry removals during merge correctly Junio C Hamano
2005-06-09 22:48 ` [PATCH] read-tree -m 3-way: loosen an index requirement that was too strict Junio C Hamano
2005-06-09 22:49 ` [PATCH] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-09 20:35 ` [PATCH 3/3] " Junio C Hamano
2005-06-09 22:13 ` [PATCH] Add git-diff-stages command Junio C Hamano
2005-06-09 22:30 ` Linus Torvalds
2005-06-11 1:44 ` [PATCH] diff-stages: unuglify the too big main() function Junio C Hamano
2005-06-10 19:59 ` [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-18 0:15 ` Handling merge conflicts a bit more gracefully Herbert Xu
2005-06-18 0:26 ` Linus Torvalds
2005-06-09 3:07 ` Jeff Garzik
2005-06-09 4:11 ` Linus Torvalds
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=Pine.LNX.4.58.0506081738000.2286@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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 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 NNTP newsgroup(s).