Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix unclear and misleading comments in merge-recursive #826

Closed
wants to merge 1 commit into from
Closed

fix unclear and misleading comments in merge-recursive #826

wants to merge 1 commit into from

Conversation

newren
Copy link
Contributor

@newren newren commented Aug 2, 2020

No description provided.

@newren
merge-recursive: fix unclear and outright wrong comments
38faa98 
Commits 7c0a6c8 ("merge-recursive: move some definitions around to
clean up the header", 2019-08-17), and b4db8a2 ("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>
@newren
Copy link
Contributor Author

newren commented Aug 2, 2020

The test failure on osx-gcc is clearly not caused by any of my changes; my changes only tweaked comments, not actual code, and the comments I touched weren't in any python files to boot. So I'm going to ignore that error and submit.

@newren
Copy link
Contributor Author

newren commented Aug 2, 2020

/submit

@gitgitgadget-git
Copy link

Submitted as pull.826.git.git.1596338068072.gitgitgadget@gmail.com

@gitgitgadget-git
Copy link

This branch is now known as en/merge-recursive-comment-fixes.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via beb8e09.

@gitgitgadget-git gitgitgadget-git bot added the seen label Aug 2, 2020
@gitgitgadget-git
Copy link

This patch series was integrated into seen via 1de0480.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 7ec02f4.

@gitgitgadget-git
Copy link

This patch series was integrated into next via ec14b8e.

@gitgitgadget-git gitgitgadget-git bot added the next label Aug 4, 2020
@F-C-U00000000019

This comment has been minimized.

Sign in to view
@gitgitgadget-git
Copy link

This patch series was integrated into seen via 370c962.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 48a9ac3.

@atabaytebrizl

This comment has been minimized.

Sign in to view
@atabaytebrizl

This comment has been minimized.

Sign in to view
@atabaytebrizl

This comment has been minimized.

Sign in to view
@atabaytebrizl

This comment has been minimized.

Sign in to view
@gitgitgadget-git
Copy link

This patch series was integrated into seen via f33cdb9.

@git git deleted a comment Aug 10, 2020
@gitgitgadget-git
Copy link

This patch series was integrated into seen via 33cef0f.

@gitgitgadget-git
Copy link

This patch series was integrated into next via 33cef0f.

@gitgitgadget-git
Copy link

This patch series was integrated into master via 33cef0f.

@gitgitgadget-git gitgitgadget-git bot closed this Aug 10, 2020
@gitgitgadget-git
Copy link

Closed via 33cef0f.

@newren newren deleted the fix-merge-recursive-comments branch August 12, 2020 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
master next seen
Projects
None yet
Milestone
No milestone
3 participants
@newren @F-C-U00000000019 @atabaytebrizl