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-26 13:42:10 -0700 |
| commit | 26b28007689d27a921ea90e5a29fc8eb74b0d297 (patch) | |
| tree | 5d422206c3c7ca53af345f72e665bf5ae82be057 /commit.c | |
| parent | Move make_cache_entry() from merge-recursive.c into read-cache.c (diff) | |
| download | git-26b28007689d27a921ea90e5a29fc8eb74b0d297.tar.gz git-26b28007689d27a921ea90e5a29fc8eb74b0d297.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions