diff options
| author | Harald Nordgren <haraldnordgren@gmail.com> | 2026-03-04 12:25:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-04 10:13:33 -0800 |
| commit | 68791d7506aa39da7c98de4143cac09cc93fc404 (patch) | |
| tree | a2ef9399e9254382a8323fbb391d302115ecaf23 /Documentation | |
| parent | 3ea95ac9c5a8ac60702b157153498453afe7ab3b (diff) | |
| download | git-68791d7506aa39da7c98de4143cac09cc93fc404.tar.xz | |
status: clarify how status.compareBranches deduplicates
The order of output when multiple branches are specified on the
configuration variable was not clearly spelled out in the
documentation.
Add a paragraph to describe the order and also how the branches are
deduplicated. Update t6040 with additional tests to illustrate how
multiple branches are shown and deduplicated.
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
[jc: made a whole replacement into incremental; wrote log message.]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/status.adoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/status.adoc b/Documentation/config/status.adoc index 15ccd0116b..b5dd85b761 100644 --- a/Documentation/config/status.adoc +++ b/Documentation/config/status.adoc @@ -26,6 +26,12 @@ status.compareBranches:: If not set, the default behavior is equivalent to `@{upstream}`, which compares against the configured upstream tracking branch. + +The entries are shown in the order they appear in the configuration. +Duplicate entries that resolve to the same ref are suppressed after +their first occurrence, so `@{push} @{upstream} @{push}` shows at +most two comparisons. When `@{upstream}` and `@{push}` resolve to +the same remote-tracking branch, only one comparison is shown. ++ Example: + ---- |