From: Junio C Hamano <junkio@cox.net>
To: Marc Singer <elf@buici.com>
Cc: Linus Torvalds <torvalds@osdl.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Effective difference between git-rebase and git-resolve
Date: Fri, 24 Mar 2006 22:10:00 -0800 [thread overview]
Message-ID: <7v1wwrys07.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060325043507.GA14644@buici.com> (Marc Singer's message of "Fri, 24 Mar 2006 20:35:07 -0800")
Marc Singer <elf@buici.com> writes:
>> git merge "Merge with Linus" work linus
>>
>> instead, which will use the proper "recursive" merge functionality.
>
> OK. I'll see if that is more successful. It would be nice if the
> resolve command printed a message about the command being deprecated.
The only reason I didn't do that was because I just did not want
to disrupt the workflow by Linus. If nobody in the upper
echelon of kernel people (meaning, longest-time git users) use
git-resolve anymore, I think we should mark it deprecated and
remove it eventually.
next prev parent reply other threads:[~2006-03-25 6:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-25 3:54 Effective difference between git-rebase and git-resolve Marc Singer
2006-03-25 4:23 ` Linus Torvalds
2006-03-25 6:08 ` Junio C Hamano
2006-03-25 6:32 ` Marc Singer
2006-03-25 7:15 ` Junio C Hamano
2006-03-26 20:29 ` J. Bruce Fields
[not found] ` <20060325043507.GA14644@buici.com>
2006-03-25 6:10 ` Junio C Hamano [this message]
2006-03-25 9:37 ` Johannes Schindelin
2006-03-25 11:08 ` Mark Wooding
2006-03-25 11:26 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1wwrys07.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=elf@buici.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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).