FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Format quoted option string as <code> in HTML by katrinleinweber · Pull Request #1164 · progit/progit2 · GitHub

/ progit2 Public

Format quoted option string as <code> in HTML #1164

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

Merged
ben merged 1 commit into from
Jan 20, 2019
Conversation 2 Commits 1 Checks 0 Files changed
Merged

Format quoted option string as <code> in HTML #1164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .asc  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/advanced-merging.asc
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Let's explore a couple of tools that you now have at your disposal to determine
Perhaps it's not obvious how exactly you should fix this conflict.
You need more context.

One helpful tool is `git checkout` with the `--conflict' option.
One helpful tool is `git checkout` with the `--conflict` option.
This will re-checkout the file again and replace the merge conflict markers.
This can be useful if you want to reset the markers and try to resolve them again.

Expand Down
Back | FazBrowse Home | New Git URL