[PATCH v4 00/44] Make git-am a builtin · Paul Tan <hidden> · 2016-06-15
[PATCH v4 01/44] wrapper: implement xopen() · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 01/44] wrapper: implement xopen() · Torsten Bögershausen <hidden> · 2016-06-15
Re: [PATCH v4 01/44] wrapper: implement xopen() · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 01/44] wrapper: implement xopen() · Paul Tan <hidden> · 2016-06-15
[PATCH v4 02/44] wrapper: implement xfopen() · Paul Tan <hidden> · 2016-06-15
[PATCH v4 03/44] builtin-am: implement skeletal builtin am · Paul Tan <hidden> · 2016-06-15
[PATCH v4 04/44] builtin-am: implement patch queue mechanism · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 04/44] builtin-am: implement patch queue mechanism · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 04/44] builtin-am: implement patch queue mechanism · Paul Tan <hidden> · 2016-06-15
[PATCH v4 06/44] builtin-am: auto-detect mbox patches · Paul Tan <hidden> · 2016-06-15
[PATCH v4 05/44] builtin-am: split out mbox/maildir patches with git-mailsplit · Paul Tan <hidden> · 2016-06-15
[PATCH v4 09/44] builtin-am: implement committing applied patch · Paul Tan <hidden> · 2016-06-15
[PATCH v4 07/44] builtin-am: extract patch and commit info with git-mailinfo · Paul Tan <hidden> · 2016-06-15
[PATCH v4 08/44] builtin-am: apply patch with git-apply · Paul Tan <hidden> · 2016-06-15
[PATCH v4 10/44] builtin-am: refuse to apply patches if index is dirty · Paul Tan <hidden> · 2016-06-15
[PATCH v4 11/44] builtin-am: implement --resolved/--continue · Paul Tan <hidden> · 2016-06-15
[PATCH v4 13/44] builtin-am: implement --abort · Paul Tan <hidden> · 2016-06-15
[PATCH v4 12/44] builtin-am: implement --skip · Paul Tan <hidden> · 2016-06-15
[PATCH v4 14/44] builtin-am: reject patches when there's a session in progress · Paul Tan <hidden> · 2016-06-15
[PATCH v4 15/44] builtin-am: implement -q/--quiet, GIT_QUIET · Paul Tan <hidden> · 2016-06-15
[PATCH v4 16/44] builtin-am: exit with user friendly message on failure · Paul Tan <hidden> · 2016-06-15
[PATCH v4 18/44] cache-tree: introduce write_index_as_tree() · Paul Tan <hidden> · 2016-06-15
[PATCH v4 17/44] builtin-am: implement -s/--signoff · Paul Tan <hidden> · 2016-06-15
[PATCH v4 19/44] builtin-am: implement --3way, am.threeway · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 19/44] builtin-am: implement --3way, am.threeway · Stefan Beller <hidden> · 2016-06-15
[PATCH v4 20/44] builtin-am: implement --rebasing mode · Paul Tan <hidden> · 2016-06-15
[PATCH v4 25/44] builtin-am: implement --[no-]message-id, am.messageid · Paul Tan <hidden> · 2016-06-15
[PATCH v4 24/44] builtin-am: implement -k/--keep, --keep-non-patch · Paul Tan <hidden> · 2016-06-15
[PATCH v4 23/44] builtin-am: implement -u/--utf8 · Paul Tan <hidden> · 2016-06-15
[PATCH v4 22/44] builtin-am: handle stray state directory · Paul Tan <hidden> · 2016-06-15
[PATCH v4 21/44] builtin-am: bypass git-mailinfo when --rebasing · Paul Tan <hidden> · 2016-06-15
[PATCH v4 27/44] builtin-am: implement --[no-]scissors · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 27/44] builtin-am: implement --[no-]scissors · Paul Tan <hidden> · 2016-06-15
[PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply · Stefan Beller <hidden> · 2016-06-15
[PATCH v4 26/44] builtin-am: support --keep-cr, am.keepcr · Paul Tan <hidden> · 2016-06-15
[PATCH v4 30/44] builtin-am: implement --committer-date-is-author-date · Paul Tan <hidden> · 2016-06-15
[PATCH v4 29/44] builtin-am: implement --ignore-date · Paul Tan <hidden> · 2016-06-15
[PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign · Stefan Beller <hidden> · 2016-06-15
[PATCH v4 32/44] builtin-am: invoke post-rewrite hook · Paul Tan <hidden> · 2016-06-15
[PATCH v4 33/44] builtin-am: support automatic notes copying · Paul Tan <hidden> · 2016-06-15
[PATCH v4 35/44] builtin-am: invoke pre-applypatch hook · Paul Tan <hidden> · 2016-06-15
[PATCH v4 34/44] builtin-am: invoke applypatch-msg hook · Paul Tan <hidden> · 2016-06-15
[PATCH v4 36/44] builtin-am: invoke post-applypatch hook · Paul Tan <hidden> · 2016-06-15
[PATCH v4 39/44] builtin-am: support and auto-detect StGit series files · Paul Tan <hidden> · 2016-06-15
[PATCH v4 37/44] builtin-am: rerere support · Paul Tan <hidden> · 2016-06-15
[PATCH v4 38/44] builtin-am: support and auto-detect StGit patches · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 38/44] builtin-am: support and auto-detect StGit patches · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 38/44] builtin-am: support and auto-detect StGit patches · Eric Sunshine <hidden> · 2016-06-15
[PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches · Paul Tan <hidden> · 2016-06-15
[PATCH v4 41/44] builtin-am: implement -i/--interactive · Paul Tan <hidden> · 2016-06-15
[PATCH v4 43/44] builtin-am: check for valid committer ident · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 43/44] builtin-am: check for valid committer ident · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 43/44] builtin-am: check for valid committer ident · Paul Tan <hidden> · 2016-06-15
[PATCH v4 42/44] builtin-am: implement legacy -b/--binary option · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 42/44] builtin-am: implement legacy -b/--binary option · Stefan Beller <hidden> · 2016-06-15
[PATCH v4 44/44] builtin-am: remove redirection to git-am.sh · Paul Tan <hidden> · 2016-06-15
Re: [PATCH v4 00/44] Make git-am a builtin · Stefan Beller <hidden> · 2016-06-15
Re: [PATCH v4 00/44] Make git-am a builtin · Stefan Beller <hidden> · 2016-06-15

Re: [PATCH v4 19/44] builtin-am: implement --3way, am.threeway

From: Stefan Beller <hidden>
Date: 2016-06-15 23:05:35

+/**
+ * Builds a index that contains just the blobs needed for a 3way merge.

an index

`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