summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/RelNotes/2.9.0.txt19
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-send-email.txt2
4 files changed, 22 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index f6e288b..35c1385 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -146,7 +146,7 @@ else
ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
endif
endif
-ifdef MAN_BOLD_LITERAL
+ifndef NO_MAN_BOLD_LITERAL
XMLTO_EXTRA += -m manpage-bold-literal.xsl
endif
ifdef DOCBOOK_SUPPRESS_SP
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
index 9b8fdc5..d9685cb 100644
--- a/Documentation/RelNotes/2.9.0.txt
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -154,6 +154,13 @@ UI, Workflows & Features
auth enabled that they need app-specific-password when using
"git send-email".
+ * The manpage output of our documentation did not render well in
+ terminal; typeset literals in bold by default to make them stand
+ out more.
+
+ * The mark-up in the top-level README.md file has been updated to
+ typeset CLI command names differently from the body text.
+
Performance, Internal Implementation, Development Support etc.
@@ -247,6 +254,10 @@ Performance, Internal Implementation, Development Support etc.
* test updates to make it more readable and maintainable.
(merge e6273f4 es/t1500-modernize later to maint).
+ * "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
+ config.mak didn't.
+ (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
+
Also contains various documentation updates and code clean-ups.
@@ -495,6 +506,11 @@ notes for details).
haven't finished reading it.
(merge f4beed6 fc/fast-import-broken-marks-file later to maint).
+ * "git rebase -i", after it fails to auto-resolve the conflict, had
+ an unnecessary call to "git rerere" from its very early days, which
+ was spotted recently; the call has been removed.
+ (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
+
* Other minor clean-ups and documentation updates
(merge 832c0e5 lp/typofixes later to maint).
(merge f5ee54a sb/z-is-gnutar-ism later to maint).
@@ -506,3 +522,6 @@ notes for details).
(merge a75a308 tb/t5601-sed-fix later to maint).
(merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).
(merge dee2303 va/mailinfo-doc-typofix later to maint).
+ (merge cd82b7a pa/cherry-pick-doc-typo later to maint).
+ (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
+ (merge aa20cbc rs/apply-name-terminate later to maint).
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 6154e57..c104a59 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -128,7 +128,7 @@ effect to your index in a row.
--allow-empty-message::
By default, cherry-picking a commit with an empty message will fail.
- This option overrides that behaviour, allowing commits with empty
+ This option overrides that behavior, allowing commits with empty
messages to be cherry picked.
--keep-redundant-commits::
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index edbba3a..a88d186 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -450,7 +450,7 @@ edit ~/.gitconfig to specify your account settings:
smtpUser = yourname@gmail.com
smtpServerPort = 587
-If you have multifactor authentication setup on your gmail acocunt, you will
+If you have multifactor authentication setup on your gmail account, you will
need to generate an app-specific password for use with 'git send-email'. Visit
https://security.google.com/settings/security/apppasswords to setup an
app-specific password. Once setup, you can store it with the credentials