-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Update patches page #916
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
Update patches page #916
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0d93689
added a note about line endings in windows, fixes #913
Burgov 5d92960
added a note about committing patches to the 2.0 branch
Burgov 30e5869
added information on squashing commits
Burgov 77ffd39
updates per @stof
Burgov 7e586aa
added a note per @stof
Burgov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -96,21 +96,22 @@ Set up your user information with your real name and a working email address: | |
.. tip:: | ||
|
||
Windows users: when installing Git, the installer will ask what to do with | ||
line endings and suggests to replace all Lf by CrLf. This is the wrong | ||
setting if you wish to contribute to Symfony! Either select the as-is method | ||
or the Lf method. If you have already installed Git, you can check the value | ||
of this setting by typing: | ||
line endings and suggests to replace all Lf by CRLF. This is the wrong | ||
setting if you wish to contribute to Symfony! Selecting the as-is method is | ||
your best choice, as git will convert your line feeds to the ones in the | ||
repository. If you have already installed Git, you can check the value of | ||
this setting by typing: | ||
|
||
.. code-block:: bash | ||
|
||
$ git config core.autocrlf | ||
|
||
This will return either "false", "input" or "true", "true" being the wrong | ||
value. Set it to another value by typing: | ||
This will return either "false", "input" or "true", "true" and "false" being | ||
the wrong values. Set it to another value by typing: | ||
|
||
.. code-block:: bash | ||
|
||
$ git config --global core.autocrlf false | ||
$ git config --global core.autocrlf input | ||
|
||
Replace --global by --local if you want to set it only for the active | ||
repository | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the recommended value is |
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it actually possible to put code blocks in tips?