From: Junio C Hamano <junkio@cox.net>
To: Len Brown <len.brown@intel.com>
Cc: git@vger.kernel.org
Subject: Re: needs merge
Date: Sat, 07 Jan 2006 00:41:34 -0800 [thread overview]
Message-ID: <7v1wzko2f5.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200601070332.36654.len.brown@intel.com> (Len Brown's message of "Sat, 7 Jan 2006 03:32:36 -0500")
Len Brown <len.brown@intel.com> writes:
> $ git commit
> my-file needs merge
>
> how do i tell git that there is no merge to do and the (unchanged) working file is what
> i want to keep as the result of the merge?
Do you mean running
$ git update-index my-file
to mark the path resolved?
next prev parent reply other threads:[~2006-01-07 8:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-07 8:32 needs merge Len Brown
2006-01-07 8:41 ` Junio C Hamano [this message]
2006-01-07 8:57 ` Len Brown
2006-01-07 10:28 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2006-01-07 10:33 Brown, Len
2006-01-07 21:06 ` Junio C Hamano
2006-01-10 5:21 ` Daniel Barkalow
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=7v1wzko2f5.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=len.brown@intel.com \
/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).