Skip to content

remove confusing outdated note on interactive rebasing #3460

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.

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

Merged
merged 1 commit into from
Jan 21, 2014

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Jan 10, 2014

Q A
Doc fix? yes
New docs? no
Applies to all
Fixed tickets #3458


.. note::

``-f`` is a shortcut for the ``--force`` switch.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we not use --force in the docs to make it all clear?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, but the note above used --force before which is quite confusing, isn't it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we use --force everywhere in this article instead of -f, there is no confusing and we don't need such a note.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for using long options; explaining Git's short options should not be part of Symfony's docs.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. Replaced -f with --force

@weaverryan
Copy link
Member

Thanks for taking care of this @xabbuh - very awesomely handled

weaverryan added a commit that referenced this pull request Jan 21, 2014
…buh)

This PR was merged into the 2.3 branch.

Discussion
----------

remove confusing outdated note on interactive rebasing

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #3458

Commits
-------

eec82ed remove confusing outdated note on interactive rebasing
@weaverryan weaverryan merged commit eec82ed into symfony:2.3 Jan 21, 2014
@xabbuh xabbuh deleted the issue-3458 branch April 3, 2014 16:52
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.

4 participants