[PATCH 00/15] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 01/15] Move split_cmdline() to alias.c · Miklos Vajna <hidden> · 2016-06-15
[PATCH 02/15] Move commit_list_count() to commit.c · Miklos Vajna <hidden> · 2016-06-15
[PATCH 03/15] Move parse-options's skip_prefix() to git-compat-util.h · Miklos Vajna <hidden> · 2016-06-15
[PATCH 04/15] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Miklos Vajna <hidden> · 2016-06-15
[PATCH 05/15] Move read_cache_unmerged() to read-cache.c · Miklos Vajna <hidden> · 2016-06-15
[PATCH 06/15] git-fmt-merge-msg: make it usable from other builtins · Miklos Vajna <hidden> · 2016-06-15
[PATCH 07/15] Introduce get_octopus_merge_bases() in commit.c · Miklos Vajna <hidden> · 2016-06-15
[PATCH 08/15] Add new test to ensure git-merge handles more than 25 refs. · Miklos Vajna <hidden> · 2016-06-15
[PATCH 09/15] Introduce get_merge_bases_many() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 10/15] Introduce reduce_heads() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 12/15] strbuf_vaddf(): support %*s, too · Miklos Vajna <hidden> · 2016-06-15
[PATCH 13/15] Add new test case to ensure git-merge reduces octopus parents when possible · Miklos Vajna <hidden> · 2016-06-15
[PATCH 14/15] Add new test case to ensure git-merge prepends the custom merge message · Miklos Vajna <hidden> · 2016-06-15
[PATCH 15/15] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 15/15] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Miklos Vajna <hidden> · 2016-06-15
[PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Jakub Narebski <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Alex Riesen <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 13/14] git-commit-tree: make it usable from other builtins · Miklos Vajna <hidden> · 2016-06-15
[PATCH 14/14] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 00/14] Build in merge · Miklos Vajna <hidden> · 2016-06-15
[PATCH 08/14] Add new test to ensure git-merge handles more than 25 refs. · Miklos Vajna <hidden> · 2016-06-15
[PATCH 13/14] git-commit-tree: make it usable from other builtins · Miklos Vajna <hidden> · 2016-06-15
[PATCH 14/14] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 14/14] Build in merge · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 14/14] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 13/14] git-commit-tree: make it usable from other builtins · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Olivier Marin <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 13/13] Build in merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 11/15] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() · Alex Riesen <hidden> · 2016-06-15
[PATCH 08/15] Add new test to ensure git-merge handles more than 25 refs. · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 04/15] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Olivier Marin <hidden> · 2016-06-15
[PATCH] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 04/15] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Mike Ralphson <hidden> · 2016-06-15
Re: [PATCH 04/15] Add new test to ensure git-merge handles pull.twohead and pull.octopus · Miklos Vajna <hidden> · 2016-06-15
[PATCH] Fix t7601-merge-pull-config.sh on AIX · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH 01/15] Move split_cmdline() to alias.c · Olivier Marin <hidden> · 2016-06-15
Re: [PATCH 01/15] Move split_cmdline() to alias.c · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 01/15] Move split_cmdline() to alias.c · Olivier Marin <hidden> · 2016-06-15
Re: [PATCH 01/15] Move split_cmdline() to alias.c · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 01/15] Move split_cmdline() to alias.c · Olivier Marin <hidden> · 2016-06-15

Re: [PATCH 13/14] git-commit-tree: make it usable from other builtins

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:52

Hi,

On Tue, 1 Jul 2008, Miklos Vajna wrote:

I did it this way to avoid an unnecessary conflict with Dscho's recent 
patch to commit-tree (ef98c5c).

Oh, sorry!

Funnily enough, I committed and tested this change in my clone of 
builtin-merge before I realized that I am in the wrong directory ;-)

Ciao,
Dscho

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help