diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 11:41:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:03 -0700 |
| commit | ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7 (patch) | |
| tree | 8007ffb36bb8cec347919b40ac2e1a72f142919d /commit.c | |
| parent | merge-recursive: fix some overly long lines (diff) | |
| download | git-ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7.tar.gz git-ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7.zip | |
merge-recursive: use common name for ancestors/common/base_list
merge_trees(), merge_recursive(), and merge_recursive_generic() in
their function headers used four different names for the merge base or
list of merge bases they were passed:
* 'common'
* 'ancestors'
* 'ca'
* 'base_list'
They were able to refer to it four different ways instead of only three
by using a different name in the signature for the .c file than the .h
file. Change all of these to 'merge_base' or 'merge_bases'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions