Skip to content

Small fixes #2001

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Small fixes #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11a234
doc: fix and unify descriptions of diff context options
jnavila Nov 16, 2025
f9d7307
doc: fix missing basic markup in git-checkout documentation
jnavila Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Documentation/diff-context-options.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
or 3 if the config option is unset.

`--inter-hunk-context=<n>`::
Show the context between diff hunks, up to the specified _<number>_
of lines, thereby fusing hunks that are close to each other.
Show the context between diff hunks, up to _<n>_
lines, thereby fusing hunks that are close to each other.
Defaults to `diff.interHunkContext` or 0 if the config option
is unset.
10 changes: 5 additions & 5 deletions Documentation/diff-options.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ endif::git-log[]

`-U<n>`::
`--unified=<n>`::
Generate diffs with _<n>_ lines of context instead of
the usual three.
Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
or 3 if the config option is unset.
ifndef::git-format-patch[]
Implies `--patch`.
endif::git-format-patch[]
Expand Down Expand Up @@ -806,9 +806,9 @@ endif::git-format-patch[]
Ignore changes whose all lines match _<regex>_. This option may
be specified more than once.

`--inter-hunk-context=<number>`::
Show the context between diff hunks, up to the specified _<number>_
of lines, thereby fusing hunks that are close to each other.
`--inter-hunk-context=<n>`::
Show the context between diff hunks, up to _<n>_
lines, thereby fusing hunks that are close to each other.
Defaults to `diff.interHunkContext` or 0 if the config option
is unset.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-checkout.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ of it").
`--track[=(direct|inherit)]`::
When creating a new branch, set up "upstream" configuration. See
`--track` in linkgit:git-branch[1] for details. As a convenience,
--track without -b implies branch creation.
`--track` without `-b` implies branch creation.
+
If no `-b` option is given, the name of the new branch will be
derived from the remote-tracking branch, by looking at the local part of
Expand Down
Loading