diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-09-17 23:34:06 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 17:41:18 -0700 |
commit | 7a98869935a3682b5ff9679c92bf9bc12f87d8c5 (patch) | |
tree | f938e05dafa951d6f18ffb1f6f7c5ba1ffb46bd7 /merge-file.c | |
parent | Merge branch 'maint' (diff) | |
download | tgif-7a98869935a3682b5ff9679c92bf9bc12f87d8c5.tar.xz |
apply: get rid of --index-info in favor of --build-fake-ancestor
git-am used "git apply -z --index-info" to find the original versions
of the files touched by the diff, to be able to do an inexpensive
three-way merge.
This operation makes only sense in a repository, since the index
information in the diff refers to blobs, which have to be present in
the current repository.
Therefore, teach "git apply" a mode to write out the result as an
index file to begin with, obviating the need for scripts to do it
themselves.
The sole user for --index-info is "git am" is converted to
use --build-fake-ancestor in this patch.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions