diff --git a/RelNotes/2.51.0.adoc b/RelNotes/2.51.0.adoc index f9e6a5410..5e254541b 100644 --- a/RelNotes/2.51.0.adoc +++ b/RelNotes/2.51.0.adoc @@ -53,6 +53,14 @@ UI, Workflows & Features * Clean up the way how signature on commit objects are exported to and imported from fast-import stream. + * Remove unsupported, unused, and unsupportable old option from "git + log". + + * Document recently added "git imap-send --list" with an example. + + * "git pull" learned to pay attention to pull.autostash configuration + variable, which overrides rebase/merge.autostash. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -107,6 +115,16 @@ Performance, Internal Implementation, Development Support etc. worst case performance characteristics, which has been optimized by using prio-queue data structure. + * Move structure definition from unrelated header file to where it + belongs. + + * To help our developers, document what C99 language features are + being considered for adoption, in addition to what past experiments + have already decided. + + * The reftable unit tests are now ported to the "clar" unit testing + framework. + Fixes since v2.50 ----------------- @@ -260,3 +278,7 @@ including security updates, are included in this release. (merge f4fa8a3687 rh/doc-glob-pathspec-fix later to maint). (merge b27be108c8 ja/doc-git-log-markup later to maint). (merge 14d7583beb pw/config-kvi-remove-path later to maint). + (merge f31abb421d jc/do-not-scan-argv-without-parsing later to maint). + (merge 26552cb62a jk/unleak-reflog-expire-entry later to maint). + (merge 339d95fda9 jc/ci-print-test-failures-fix later to maint). + (merge 8c3add51a8 cb/meson-avoid-broken-macos-pcre2 later to maint). diff --git a/git-config.html b/git-config.html index d6e00962a..1e27e83bf 100644 --- a/git-config.html +++ b/git-config.html @@ -7740,6 +7740,24 @@

Variables

The default merge strategy to use when pulling multiple branches at once.

+
pull.autoStash
+
+

When set to true, automatically create a temporary stash entry +to record the local changes before the operation begins, and +restore them after the operation completes. When your "git +pull" rebases (instead of merges), this may be convenient, since +unlike merging pull that tolerates local changes that do not +interfere with the merge, rebasing pull refuses to work with any +local changes.

+
+

If pull.autostash is set (either to true or false), +merge.autostash and rebase.autostash are ignored. If +pull.autostash is not set at all, depending on the value of +pull.rebase, merge.autostash or rebase.autostash is used +instead. Can be overridden by the --[no-]autostash command line +option.

+
+
pull.twohead

The default merge strategy to use when pulling a single branch.

diff --git a/git-imap-send.adoc b/git-imap-send.adoc index 17147f93c..278e5ccd3 100644 --- a/git-imap-send.adoc +++ b/git-imap-send.adoc @@ -68,6 +68,34 @@ include::includes/cmd-config-section-rest.adoc[] include::config/imap.adoc[] +GETTING A LIST OF AVAILABLE FOLDERS +----------------------------------- + +In order to send an email to a specific folder, you need to know the correct name of +intended folder in your mailbox. The names like "Junk", "Trash" etc. displayed by +various email clients need not be the actual names of the folders stored in the mail +server of your email provider. + +In order to get the correct folder name to be used with `git imap-send`, you can run +`git imap-send --list`. This will display a list of valid folder names. An example +of such an output when run on a Gmail account is: + +......................... +* LIST (\HasNoChildren) "/" "INBOX" +* LIST (\HasChildren \Noselect) "/" "[Gmail]" +* LIST (\All \HasNoChildren) "/" "[Gmail]/All Mail" +* LIST (\Drafts \HasNoChildren) "/" "[Gmail]/Drafts" +* LIST (\HasNoChildren \Important) "/" "[Gmail]/Important" +* LIST (\HasNoChildren \Sent) "/" "[Gmail]/Sent Mail" +* LIST (\HasNoChildren \Junk) "/" "[Gmail]/Spam" +* LIST (\Flagged \HasNoChildren) "/" "[Gmail]/Starred" +* LIST (\HasNoChildren \Trash) "/" "[Gmail]/Trash" +......................... + +Here, you can observe that the correct name for the "Junk" folder is `[Gmail]/Spam` +and for the "Trash" folder is `[Gmail]/Trash`. Similar logic can be used to determine +other folders as well. + EXAMPLES -------- Using tunnel mode: diff --git a/git-imap-send.html b/git-imap-send.html index 9df096468..66ffd938d 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -595,6 +595,40 @@

CONFIGURATION

+

GETTING A LIST OF AVAILABLE FOLDERS

+
+
+

In order to send an email to a specific folder, you need to know the correct name of +intended folder in your mailbox. The names like "Junk", "Trash" etc. displayed by +various email clients need not be the actual names of the folders stored in the mail +server of your email provider.

+
+
+

In order to get the correct folder name to be used with git imap-send, you can run +git imap-send --list. This will display a list of valid folder names. An example +of such an output when run on a Gmail account is:

+
+
+
+
* LIST (\HasNoChildren) "/" "INBOX"
+* LIST (\HasChildren \Noselect) "/" "[Gmail]"
+* LIST (\All \HasNoChildren) "/" "[Gmail]/All Mail"
+* LIST (\Drafts \HasNoChildren) "/" "[Gmail]/Drafts"
+* LIST (\HasNoChildren \Important) "/" "[Gmail]/Important"
+* LIST (\HasNoChildren \Sent) "/" "[Gmail]/Sent Mail"
+* LIST (\HasNoChildren \Junk) "/" "[Gmail]/Spam"
+* LIST (\Flagged \HasNoChildren) "/" "[Gmail]/Starred"
+* LIST (\HasNoChildren \Trash) "/" "[Gmail]/Trash"
+
+
+
+

Here, you can observe that the correct name for the "Junk" folder is [Gmail]/Spam +and for the "Trash" folder is [Gmail]/Trash. Similar logic can be used to determine +other folders as well.

+
+
+
+

EXAMPLES

@@ -786,7 +820,7 @@

GIT