Junio C Hamano <gitster@pobox.com> wrote:git-gui apparently doesn't use either name right now. It avoids needing to use GIT_REFLOG_ACTION by invoking only plumbing, except in the case of git-merge, where it invokes git-merge and thus avoids the need to set GITHEAD_* to get conflict markers right when the recursive strategy gets used. I had started to replace git-merge in Tcl and have git-gui directly invoke merge-recursive but I haven't gotten around to really doing that. So I guess we could rename those two "internal" environment variables to use a leading _ to make them different from "user level" variables, but why change them now? I really don't see a compelling reason to break that part of the "API" between porcelain/plumbing. -- Shawn. - 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
| Linus Torvalds | Re: [REPORT] cfs-v4 vs sd-0.44 |
| Mariusz Kozlowski | [PATCH 02] kmalloc + memset conversion to kzalloc |
| Andi Kleen | [PATCH] [16/22] x86: Move swsusp __pa() dependent code to arch portion |
| Vegard Nossum | [RFC][PATCH] bitfields API |
git: | |
| Carl Worth | [PATCH] commit: Steer new users toward "git commit -a" rather than update-index |
| Wincent Colaiuta | Re: [ANNOUNCE] GIT 1.5.4 |
| Junio C Hamano | Re: Decompression speed: zip vs lzo |
| Nicolas Pitre | Re: cloning the kernel - why long time in "Resolving 313037 deltas" |
| Alexey Suslikov | OT: OpenBSD on Asus eeePC |
| Bertram Scharpf | First install: Grub doesn't find partitions |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| bsd_news | LC_COLLATE and PostgreSQL |
| David Miller | [PATCH]: Fix networking scatterlist regressions. |
| Indan Zupancic | Re: Realtek 8111C transmit timed out |
| Ilpo Järvinen | [RFC PATCH 6/8] [NET]: uninline skb_trim, de-bloats |
| Patrick McHardy | Re: [NETFILTER]: Introduce nf_inet_address |
