summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-12-28 13:39:54 +0900
committerJunio C Hamano <gitster@pobox.com>2022-12-28 13:39:54 +0900
commitd4b8156f26f9cf0d55716efa452d28f2f193f851 (patch)
tree064a261490576bb1b1000a2502b0f4093bed4407
parentb980e52b528a942fda8fbc84ac770be52f910aa9 (diff)
downloadgit-htmldocs-d4b8156f26f9cf0d55716efa452d28f2f193f851.tar.gz
Autogenerated HTML docs for v2.39.0-137-g6bae5
-rw-r--r--RelNotes/2.40.0.txt9
-rw-r--r--git-var.html15
-rw-r--r--git-var.txt8
-rw-r--r--howto/coordinate-embargoed-releases.html2
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
19 files changed, 47 insertions, 17 deletions
diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt
index bd40d3542..634f0ae33 100644
--- a/RelNotes/2.40.0.txt
+++ b/RelNotes/2.40.0.txt
@@ -19,6 +19,10 @@ UI, Workflows & Features
* The advice message given by "git status" when it takes long time to
enumerate untracked paths has been updated.
+ * Just like "git var GIT_EDITOR" abstracts the complex logic to
+ choose which editor gets used behind it, "git var" now give support
+ to GIT_SEQUENCE_EDITOR.
+
Performance, Internal Implementation, Development Support etc.
@@ -73,6 +77,11 @@ Fixes since v2.39
terminating LF in Git 2.39, which has been corrected.
(merge 209d9cb011 pg/diff-stat-unmerged-regression-fix later to maint).
+ * "git pull -v --recurse-submodules" attempted to pass "-v" down to
+ underlying "git submodule update", which did not understand the
+ request and barfed, which has been corrected.
+ (merge 6f65f84766 ss/pull-v-recurse-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint).
(merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint).
diff --git a/git-var.html b/git-var.html
index 1a73d5405..da547738d 100644
--- a/git-var.html
+++ b/git-var.html
@@ -824,6 +824,19 @@ GIT_EDITOR
</p>
</dd>
<dt class="hdlist1">
+GIT_SEQUENCE_EDITOR
+</dt>
+<dd>
+<p>
+ Text editor used to edit the <em>todo</em> file while running <code>git rebase
+ -i</code>. Like <code>GIT_EDITOR</code>, the value is meant to be interpreted by
+ the shell when it is used. The order of preference is the
+ <code>$GIT_SEQUENCE_EDITOR</code> environment variable, then
+ <code>sequence.editor</code> configuration, and then the value of <code>git var
+ GIT_EDITOR</code>.
+</p>
+</dd>
+<dt class="hdlist1">
GIT_PAGER
</dt>
<dd>
@@ -865,7 +878,7 @@ GIT_DEFAULT_BRANCH
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-14 18:45:42 JST
+ 2022-12-28 13:37:45 JST
</div>
</div>
</body>
diff --git a/git-var.txt b/git-var.txt
index 0ab5bfa7d..f40202b8e 100644
--- a/git-var.txt
+++ b/git-var.txt
@@ -50,6 +50,14 @@ ifdef::git-default-editor[]
The build you are using chose '{git-default-editor}' as the default.
endif::git-default-editor[]
+GIT_SEQUENCE_EDITOR::
+ Text editor used to edit the 'todo' file while running `git rebase
+ -i`. Like `GIT_EDITOR`, the value is meant to be interpreted by
+ the shell when it is used. The order of preference is the
+ `$GIT_SEQUENCE_EDITOR` environment variable, then
+ `sequence.editor` configuration, and then the value of `git var
+ GIT_EDITOR`.
+
GIT_PAGER::
Text viewer for use by Git commands (e.g., 'less'). The value
is meant to be interpreted by the shell. The order of preference
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 4c744401e..9aa132074 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:31 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index d3005a948..1b1d5f1ba 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:30 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index ee9797a2f..c1e159859 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:31 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index 3b2a76538..1823b3415 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:26 JST
+ 2022-12-28 13:38:17 JST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 23a71719a..be4f15217 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:30 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 1e93cc07f..f0b255d94 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:30 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 05444f2ba..dc179ce18 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:29 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index dfb4016f2..697ddc679 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:30 JST
+ 2022-12-28 13:38:19 JST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 19c110c17..0fbaffe82 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:29 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 4cae6eb8c..7f6f1565b 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:26 JST
+ 2022-12-28 13:38:17 JST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index fb02558f3..20c707b59 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:28 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index ce535bd26..b3ff10e1b 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:28 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index b2d26891c..c4c76c6a0 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:27 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index af4549cea..51e110a31 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:27 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 3501c37ab..0caa1e145 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:26 JST
+ 2022-12-28 13:38:17 JST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index d704d2a51..354c06b4c 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-12-26 12:26:27 JST
+ 2022-12-28 13:38:18 JST
</div>
</div>
</body>