Re: What's cooking in git.git (topics)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 18, 2008, 11:56 UTC
- Message-ID
- <alpine.DEB.1.00.0807181356010.3932@eeepc-johanness>
- In-Reply-To
- <20080718175040.6117@nanako3.lavabit.com>
Hi,
On Fri, 18 Jul 2008, Nanako Shiraishi wrote:
Show 16 quoted lines
> Quoting Junio C Hamano <gitster@pobox.com>: > > > * xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits > > + Teach git-merge -X<option> again. > > + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next > > + builtin-merge.c: use parse_options_step() "incremental parsing" > > machinery > > + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next > > > > This needs to be merged to master iff/when merge-theirs gets merged, > > but I do not think this series is widely supported, so both are on > > hold. > > Why do you say it is not widely supported? I may be wrong but I think > you developed these patches after somebody from the mailing list asked > for this feature.
Asking for a feature, and then not doing a single thing to defend why it makes sense, of a single person, who does not even speak up now, does not count for "wide support".
Ciao, Dscho