From: linux@horizon.com
To: git@vger.kernel.org, junkio@cox.net
Subject: Re: Wine + GIT
Date: 8 Dec 2005 02:30:00 -0500 [thread overview]
Message-ID: <20051208073000.7097.qmail@science.horizon.com> (raw)
> The paragraph "Once you have finished editting [sic]..." needs
> to be followed by:
>
> git-update-index those paths you hand corrected
> git-commit
This is what happens when you have people too used to using the
pre-porcelain plumbing.
How about just
git-commit <the paths you hand corrected>
If you forget any, the commit will fail, but they will have been
updated in the index, and you don't need to mention them again in the
next attempt.
(Grump... I just noticed that the "recursive" merge stratgy *doesn't*
generate a merged file containing conflict markers, at least not in
the case I tried. Instead I get "a~HEAD" and "a~branch" files.
Time to fix the docs...)
next reply other threads:[~2005-12-08 7:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-08 7:30 linux [this message]
2005-12-08 9:29 ` Wine + GIT Fredrik Kuivinen
2005-12-08 18:17 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2005-12-05 23:29 Mike McCormack
2005-12-06 2:03 ` Jeff Garzik
2005-12-06 2:26 ` Junio C Hamano
2005-12-06 17:08 ` J. Bruce Fields
2005-12-06 17:33 ` Junio C Hamano
2005-12-06 17:39 ` J. Bruce Fields
2005-12-06 17:53 ` Jon Loeliger
2005-12-07 0:56 ` Ben Clifford
2005-12-06 19:01 ` Jeff Garzik
2005-12-06 19:06 ` Mike McCormack
2005-12-06 2:18 ` Jeff Garzik
2005-12-06 23:08 ` Nick Hengeveld
2005-12-06 23:27 ` Andreas Ericsson
2005-12-06 9:02 ` Marco Costalba
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=20051208073000.7097.qmail@science.horizon.com \
--to=linux@horizon.com \
--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).