a4c2603...
by
Junio C Hamano <email address hidden>
Merge branch 'jc/patch-flow-updates' into seen
Doc updates.
Comments?
* jc/patch-flow-updates:
SubmittingPatches: extend the "flow" section
SubmittingPatches: move the patch-flow section earlier
89d8315...
by
Junio C Hamano <email address hidden>
Merge branch 'ps/reftable-reusable-iterator' into seen
* ps/reftable-reusable-iterator:
reftable/merged: adapt interface to allow reuse of iterators
reftable/stack: provide convenience functions to create iterators
reftable/reader: adapt interface to allow reuse of iterators
reftable/generic: adapt interface to allow reuse of iterators
reftable/generic: move seeking of records into the iterator
reftable/merged: simplify indices for subiterators
reftable/merged: split up initialization and seeking of records
reftable/reader: set up the reader when initializing table iterator
reftable/reader: inline `reader_seek_internal()`
reftable/reader: separate concerns of table iter and reftable reader
reftable/reader: unify indexed and linear seeking
reftable/reader: avoid copying index iterator
reftable/block: use `size_t` to track restart point index
a441889...
by
Junio C Hamano <email address hidden>
Merge branch 'jc/doc-manpages-l10n' into seen
The SubmittingPatches document now refers folks to manpages
translation project.
Comments?
* jc/doc-manpages-l10n:
SubmittingPatches: advertise git-manpages-l10n project a bit
18078f4...
by
Junio C Hamano <email address hidden>
Merge branch 'fa/p4-error' into seen
P4 update.
* fa/p4-error:
git-p4: show Perforce error to the user
5500150...
by
Junio C Hamano <email address hidden>
Merge branch 'ds/doc-config-reflow' into seen
Reflow a paragraph in the documentation source without any effect
to the formatted text.
* ds/doc-config-reflow:
config.txt: perform some minor reformatting
d3ade87...
by
Junio C Hamano <email address hidden>
Merge branch 'ie/config-includeif-hostname' into seen
The conditional inclusion mechanism for configuration files learned
to switch on the hostname.
* ie/config-includeif-hostname:
config: learn the "hostname:" includeIf condition
t: add a test helper for getting hostname
8cf4880...
by
Junio C Hamano <email address hidden>
Merge branch 'bk/complete-dirname-for-am-and-format-patch' into seen
Command line completion support (in contrib/) has been
updated for a few commands to complete directory names where a
directory name is expected.
* bk/complete-dirname-for-am-and-format-patch:
completion: dir-type optargs for am, format-patch
bcc938b...
by
Junio C Hamano <email address hidden>
Merge branch 'bk/complete-send-email' into seen
Command line completion support (in contrib/) has been taught to
avoid offering revision names as candidates to "git send-email" when
the command is used to send pre-generated files.
* bk/complete-send-email:
completion: don't complete revs when --no-format-patch
f545fee...
by
Junio C Hamano <email address hidden>
Merge branch 'jc/rerere-cleanup' into seen
Code clean-up.
* jc/rerere-cleanup:
rerere: modernize use of empty strbuf
rerere: try_merge() should use LL_MERGE_ERROR when it means an error
rerere: fix comment on handle_file() helper
rerere: simplify check_one_conflict() helper function
0d1054d...
by
Junio C Hamano <email address hidden>
Merge branch 'ds/send-email-per-message-block' into seen
"git send-email" learned to separate its reports on each message it
sends out with an extra blank line in between.
Comments?
* ds/send-email-per-message-block:
send-email: make it easy to discern the messages for each patch
send-email: move newline characters out of a few translatable strings
