Re: core.autocrlf and merge conflict output

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Junio C Hamano

Subject: Re: core.autocrlf and merge conflict output

Date: Sunday, June 22, 2008 - 5:45 pm

"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:

quoted text> Apparently, the conflict information Git writes to the working copy
> during merge doesn't respect core.autocrlf,...

Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
when writing out the result, 2008-06-09) happened?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

core.autocrlf and merge conflict output, Edward Z. Yang, (Sun Jun 22, 3:08 pm)

Re: core.autocrlf and merge conflict output, Junio C Hamano, (Sun Jun 22, 5:45 pm)

Re: core.autocrlf and merge conflict output, Edward Z. Yang, (Sun Jun 22, 6:47 pm)

Re: core.autocrlf and merge conflict output, Junio C Hamano, (Sun Jun 22, 6:54 pm)

Re: core.autocrlf and merge conflict output, Johannes Schindelin, (Sun Jun 22, 7:00 pm)

Re: core.autocrlf and merge conflict output, Edward Z. Yang, (Sun Jun 22, 7:23 pm)


linux-kernel:
Jesse Barnes	Re: [stable] [BUG][PATCH] cpqphp: fix kernel NULL pointer dereference
Greg KH	[003/136] p54usb: add Zcomax XG-705A usbid
Magnus Damm	[PATCH 03/07] ARM: Use shared GIC entry macros on Realview
Oliver Neukum	Re: [Bug #13682] The webcam stopped working when upgrading from 2.6.29 to 2.6.30
Martin Schwidefsky	Re: [PATCH] optimized ktime_get[_ts] for GENERIC_TIME=y
git:
Junio C Hamano	Re: Some advanced index playing
Jeff King	Re: confusion over the new branch and merge config
Robin Rosenberg	Re: cvs2svn conversion directly to git ready for experimentation
Linus Torvalds	git binary size...
Ævar Arnfjörð Bjarmason	Re: Challenge with Git-Bash
git-commits-head:
Linux Kernel Mailing List	md: move allocation of ->queue from mddev_find to md_probe
Linux Kernel Mailing List	md: raid0: Represent zone->zone_offset in sectors.
Linux Kernel Mailing List	[ARM] S3C24XX: Add gpio_to_irq() facility
Linux Kernel Mailing List	md: raid0_make_request(): Replace local variable block by