From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: merge-recursive, was Re: What's in git.git
Date: Thu, 26 Oct 2006 02:26:31 -0700 [thread overview]
Message-ID: <7v3b9bpgvs.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0610261114520.3286@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Thu, 26 Oct 2006 11:18:23 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Thu, 26 Oct 2006, Junio C Hamano wrote:
>
>> We'd still need more work on merge-recursive to fix the
>> overcautious "working file will be overwritten by merge" --
>> this is really needed for usability.
>
> I am sorry, but I do not have the time to wrap my head around this for at
> least another week. It seems to be a complicated problem (not the fix,
> mind you, but the side effects you have to think of!), and I stupidly
> started to play with shallow clones when I knew I had no time already.
No need to worry nor feel pressure; it's all volunteer work and
we do this for fun.
> BTW what happened to the builtin shortlog? It is the last Perl script I
> use regularly... (should make people happy who are stuck with Activision
> Perl...)
Yeah, I was wondering about it too, when I was looking for
something readily mergeable to "next" today. I must have
misplaced it.
next prev parent reply other threads:[~2006-10-26 9:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-26 8:47 What's in git.git Junio C Hamano
2006-10-26 9:12 ` Jakub Narebski
2006-10-26 9:24 ` Junio C Hamano
2006-10-26 12:08 ` Petr Baudis
2006-10-26 12:17 ` Jakub Narebski
2006-10-26 9:18 ` merge-recursive, was " Johannes Schindelin
2006-10-26 9:25 ` Jakub Narebski
2006-10-26 9:35 ` Junio C Hamano
2006-10-26 9:47 ` Jakub Narebski
2006-10-26 13:23 ` Nicolas Pitre
2006-10-26 12:34 ` git-shortlog mailmap Petr Baudis
2006-10-26 12:41 ` Jakub Narebski
2006-10-26 12:43 ` Andreas Ericsson
2006-10-26 13:13 ` Jakub Narebski
2006-10-26 13:16 ` Johannes Schindelin
2006-10-26 13:29 ` Petr Baudis
2006-10-26 9:26 ` Junio C Hamano [this message]
2006-10-26 10:00 ` merge-recursive, was Re: What's in git.git Junio C Hamano
2006-10-26 10:56 ` Johannes Schindelin
2006-10-26 11:35 ` shortlog, was " Andreas Ericsson
2006-10-26 13:39 ` Nicolas Pitre
2006-10-26 13:45 ` Andreas Ericsson
2006-10-26 9:19 ` Jakub Narebski
2006-10-27 1:10 ` Petr Baudis
2006-10-26 12:22 ` Petr Baudis
2006-10-26 17:27 ` Andy Whitcroft
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=7v3b9bpgvs.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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.
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).