Skip to content

Conversation

@abitrolly
Copy link
Contributor

For the best practices.

image

@waldyrious
Copy link
Contributor

How about linking to the tldr-pages entry instead?

@abitrolly
Copy link
Contributor Author

Didn't think about it. :D Nice idea.

git imerge continue --no-edit

What does --no-edit do?

@waldyrious
Copy link
Contributor

It uses the default merge message, as described here.

It looks like that when the tldr pages entry was created, back in June 2016, the default for git imerge continue was --edit; this behavior had actually been changed a year earlier, but it was only released in September 2016. That tldr-page entry needs to be updated, since the --no-edit is now redundant :)

@abitrolly
Copy link
Contributor Author

Added tldr-pages/tldr#8118 with updates.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants