| commit | b7fa51da9be3cee9e2ca31af4edfec18b8ecbce7 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 2 Sep 2008 21:53:47 +0000 (2 23:53 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Sep 2008 05:49:34 +0000 (4 22:49 -0700) | ||
| tree | bcc610195356804b9d44bec58abaec07caaca9f4 | treesnapshot (tar.gz zip) |
| parent | 5033639c951da27fc4d4becbc3e46dc05096ce63 | commitdiff |
merge-recursive: get rid of the index_only global variable
struct merge_options already has a call_depth member, and index_only
global variable always equals to !!call_depth.
We always use index_only as a condition, so we can just
use call_depth instead of index_only.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
struct merge_options already has a call_depth member, and index_only
global variable always equals to !!call_depth.
We always use index_only as a condition, so we can just
use call_depth instead of index_only.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
| merge-recursive.c | diffblobblamehistory |