diff options
| author |  Christian Couder <christian.couder@gmail.com> | 2016-09-04 22:18:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-07 12:29:54 -0700 |
| commit | b4290342dd2d957cbcdb100c7d847802746b0730 (patch) | |
| tree | 95307bc8408099bf117f0969b9e9927ebd5bb631 /Documentation/git-merge.txt | |
| parent | apply: refactor `git apply` option parsing (diff) | |
| download | tgif-b4290342dd2d957cbcdb100c7d847802746b0730.tar.xz | |
apply: pass apply state to build_fake_ancestor()
To libify git apply functionality, we will need to read from a
different index file in get_current_sha1(). This index file will be
stored in "struct apply_state", so let's pass the state to
build_fake_ancestor() which will later pass it to get_current_sha1().
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions