Show patches with: Submitter = Alex Henrie       |    Archived = No       |   67 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,1/1] apply: support --ours, --theirs, and --union for three-way merges apply: support --ours, --theirs, and --union for three-way merges - - - --- 2024-09-09 Alex Henrie Accepted
apply: support --ours, --theirs, and --union for three-way merges apply: support --ours, --theirs, and --union for three-way merges - - - --- 2024-09-06 Alex Henrie Superseded
mergetools: vscode: new tool mergetools: vscode: new tool - - - --- 2024-09-02 Alex Henrie Accepted
[v4,1/1] sequencer: finish parsing the todo list despite an invalid first line sequencer: finish parsing the todo list despite an invalid first line - - - --- 2023-07-21 Alex Henrie Superseded
[v3,1/1] sequencer: finish parsing the todo list despite an invalid first line sequencer: finish parsing the todo list despite an invalid first line - - - --- 2023-07-21 Alex Henrie Superseded
[v2,1/1] sequencer: finish parsing the todo list despite an invalid first line sequencer: finish parsing the todo list despite an invalid first line - - - --- 2023-07-21 Alex Henrie Superseded
sequencer: finish parsing the todo list despite an invalid first line sequencer: finish parsing the todo list despite an invalid first line - - - --- 2023-07-19 Alex Henrie Superseded
[v5,3/3] push: don't imply that integration is always required before pushing don't imply that integration is always required before pushing - - - --- 2023-07-13 Alex Henrie Accepted
[v5,2/3] remote: don't imply that integration is always required before pushing don't imply that integration is always required before pushing - - - --- 2023-07-13 Alex Henrie Accepted
[v5,1/3] wt-status: don't show divergence advice when committing don't imply that integration is always required before pushing - - - --- 2023-07-13 Alex Henrie Accepted
[v3,2/2] push: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-06 Alex Henrie Superseded
[v3,1/2] remote: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-06 Alex Henrie Superseded
[v2,2/2] push: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-04 Alex Henrie Superseded
[v2,1/2] remote: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-04 Alex Henrie Superseded
[2/2] push: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-02 Alex Henrie Superseded
[1/2] remote: advise about force-pushing as an alternative to reconciliation advise about force-pushing as an alternative to reconciliation - - - --- 2023-07-02 Alex Henrie Superseded
[v4,1/1] docs: rewrite the documentation of the text and eol attributes docs: rewrite the documentation of the text and eol attributes - - - --- 2023-05-03 Alex Henrie Accepted
[v3,1/1] docs: rewrite the documentation of the text and eol attributes docs: rewrite the documentation of the text and eol attributes - - - --- 2023-05-01 Alex Henrie Superseded
[v2] docs: rewrite the documentation of the text and eol attributes [v2] docs: rewrite the documentation of the text and eol attributes - - - --- 2023-04-28 Alex Henrie Superseded
format-patch: correct documentation of --thread without an argument format-patch: correct documentation of --thread without an argument - 1 - --- 2023-04-03 Alex Henrie Accepted
[v9,3/3] rebase: add a config option for --rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-26 Alex Henrie Accepted
[v9,2/3] rebase: deprecate --rebase-merges="" rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-26 Alex Henrie Accepted
[v9,1/3] rebase: add documentation and test for --no-rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-26 Alex Henrie Accepted
[v8,3/3] rebase: add a config option for --rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-20 Alex Henrie Superseded
[v8,2/3] rebase: deprecate --rebase-merges="" rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-20 Alex Henrie Superseded
[v8,1/3] rebase: add documentation and test for --no-rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-20 Alex Henrie Superseded
[v7,3/3] rebase: add a config option for --rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-12 Alex Henrie Superseded
[v7,2/3] rebase: deprecate --rebase-merges="" rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-12 Alex Henrie Superseded
[v7,1/3] rebase: add documentation and test for --no-rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-12 Alex Henrie Superseded
[v6,3/3] rebase: add a config option for --rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-05 Alex Henrie Superseded
[v6,2/3] rebase: deprecate --rebase-merges="" rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-05 Alex Henrie Superseded
[v6,1/3] rebase: add documentation and test for --no-rebase-merges rebase: document, clean up, and introduce a config option for --rebase-merges - - - --- 2023-03-05 Alex Henrie Superseded
push: improve grammar of branch.autoSetupMerge advice push: improve grammar of branch.autoSetupMerge advice - - - --- 2022-09-28 Alex Henrie Accepted
pack-bitmap: improve grammar of "xor chain" error message pack-bitmap: improve grammar of "xor chain" error message - - - --- 2022-09-22 Alex Henrie Accepted
gc: don't translate literal commands gc: don't translate literal commands - - - --- 2022-09-20 Alex Henrie Accepted
fsmonitor--daemon: don't translate literal commands fsmonitor--daemon: don't translate literal commands - - - --- 2022-09-20 Alex Henrie Accepted
builtin/diagnose.c: don't translate the two mode values builtin/diagnose.c: don't translate the two mode values - - - --- 2022-09-20 Alex Henrie Accepted
[v2] rebase: use correct base for --keep-base when a branch is given [v2] rebase: use correct base for --keep-base when a branch is given - - - --- 2022-04-21 Alex Henrie Accepted
rebase: use correct base for --keep-base when a branch is given rebase: use correct base for --keep-base when a branch is given - - - --- 2022-04-18 Alex Henrie Superseded
[v3] convert: clarify line ending conversion warning [v3] convert: clarify line ending conversion warning - - - --- 2022-04-08 Alex Henrie Accepted
[v2] convert: clarify line ending conversion warning [v2] convert: clarify line ending conversion warning - - - --- 2022-04-05 Alex Henrie Superseded
convert: clarify line ending conversion warning convert: clarify line ending conversion warning - - - --- 2022-04-04 Alex Henrie Superseded
[v3] switch: mention the --detach option when dying due to lack of a branch [v3] switch: mention the --detach option when dying due to lack of a branch - - - --- 2022-02-26 Alex Henrie Accepted
[v2] switch: mention the --detach option when dying due to lack of a branch [v2] switch: mention the --detach option when dying due to lack of a branch - - - --- 2022-02-24 Alex Henrie Superseded
switch: mention the --detach option when dying due to lack of a branch switch: mention the --detach option when dying due to lack of a branch - - - --- 2022-02-23 Alex Henrie Superseded
[v3,2/4] log: add a --no-graph option [v3,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-11 Alex Henrie Accepted
[v3,1/4] log: fix memory leak if --graph is passed multiple times [v3,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-11 Alex Henrie Accepted
[v2,4/4] gitk: pass --no-graph to `git log` [v2,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-10 Alex Henrie Superseded
[v2,3/4] log: add a log.graph config option [v2,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-10 Alex Henrie Superseded
[v2,2/4] log: add a --no-graph option [v2,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-10 Alex Henrie Superseded
[v2,1/4] log: fix memory leak if --graph is passed multiple times [v2,1/4] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-10 Alex Henrie Superseded
[3/3] gitk: set log.graph=false when running `git log` [1/3] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-09 Alex Henrie Superseded
[2/3] log: add a config option for --graph [1/3] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-09 Alex Henrie Superseded
[1/3] log: fix memory leak if --graph is passed multiple times [1/3] log: fix memory leak if --graph is passed multiple times - - - --- 2022-02-09 Alex Henrie Superseded
pull: don't say that merge is "the default strategy" pull: don't say that merge is "the default strategy" - - - --- 2021-11-18 Alex Henrie Accepted
pull: abort if --ff-only is given and fast-forwarding is impossible pull: abort if --ff-only is given and fast-forwarding is impossible - - - --- 2021-07-11 Alex Henrie Superseded
[resend] graph: improve grammar of "invalid color" error message [resend] graph: improve grammar of "invalid color" error message - - - --- 2021-06-12 Alex Henrie Accepted
setup: split "extensions found" messages into singular and plural setup: split "extensions found" messages into singular and plural - - - --- 2021-05-18 Alex Henrie Accepted
fetch: improve grammar of "shallow roots" message fetch: improve grammar of "shallow roots" message - 1 - --- 2021-05-18 Alex Henrie Accepted
submodule: use the imperative mood to describe the --files option submodule: use the imperative mood to describe the --files option - 1 - --- 2021-05-16 Alex Henrie Accepted
stash: don't translate literal commands stash: don't translate literal commands - - - --- 2021-05-16 Alex Henrie Accepted
merge: don't translate literal commands merge: don't translate literal commands - - - --- 2021-05-15 Alex Henrie Accepted
merge-ort: split "distinct types" message into two translatable messages merge-ort: split "distinct types" message into two translatable messages 1 - - --- 2021-05-09 Alex Henrie Accepted
graph: improve grammar of "invalid color" error message graph: improve grammar of "invalid color" error message - - - --- 2021-05-09 Alex Henrie Accepted
[v2] rebase: add a config option for --no-fork-point [v2] rebase: add a config option for --no-fork-point - - - --- 2021-02-20 Alex Henrie Superseded
rebase: add a config option for --no-fork-point rebase: add a config option for --no-fork-point - - - --- 2021-01-20 Alex Henrie Superseded
pull: don't warn if pull.ff has been set pull: don't warn if pull.ff has been set - 1 - --- 2020-09-25 Alex Henrie Accepted