diff options
| author | Elijah Newren <newren@gmail.com> | 2020-08-02 03:14:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-02 18:03:57 (GMT) |
| commit | 56e743426b183d8aea8f4caa363e7f3c7da27278 (patch) | |
| tree | e06beda6ab86dd1c9bf913c1acfeb6099e48c37a /merge-recursive.c | |
| parent | b3d7a52fac39193503a0b6728771d1bf6a161464 (diff) | |
| download | git-56e743426b183d8aea8f4caa363e7f3c7da27278.zip git-56e743426b183d8aea8f4caa363e7f3c7da27278.tar.gz git-56e743426b183d8aea8f4caa363e7f3c7da27278.tar.bz2 | |
merge-recursive: fix unclear and outright wrong comments
Commits 7c0a6c8e47 ("merge-recursive: move some definitions around to
clean up the header", 2019-08-17), and b4db8a2b76 ("merge-recursive:
remove useless parameter in merge_trees()", 2019-08-17) added some
useful documentation to the functions, but had a few places where the
new comments were unclear or even misleading. Fix those comments.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 36948ea..01c633d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3529,8 +3529,9 @@ static struct commit_list *reverse_commit_list(struct commit_list *list) } /* - * Merge the commits h1 and h2, return the resulting virtual - * commit object and a flag indicating the cleanness of the merge. + * Merge the commits h1 and h2, returning a flag (int) indicating the + * cleanness of the merge. Also, if opt->priv->call_depth, create a + * virtual commit and write its location to *result. */ static int merge_recursive_internal(struct merge_options *opt, struct commit *h1, |