diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-12 15:25:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-13 11:50:37 -0700 |
| commit | 3a54f5bd5db0478c39a52b4da149e3c2413f46eb (patch) | |
| tree | 09e0f31394a5c17310bc6702b5499c292410aba8 /Documentation/git-merge.adoc | |
| parent | Merge branch 'master' of https://github.com/j6t/git-gui (diff) | |
| download | git-3a54f5bd5db0478c39a52b4da149e3c2413f46eb.tar.gz git-3a54f5bd5db0478c39a52b4da149e3c2413f46eb.zip | |
merge/pull: add the "--compact-summary" option
"git merge" and "git pull" shows "git diff --stat --summary @{1}"
when they finish to indicate the extent of the changes brought into
the history by default. While it gives a good overview, it becomes
annoying when there are very many created or deleted paths.
Introduce "--compact-summary" option to these two commands that
tells it to instead show "git diff --compact-summary @{1}", which
gives the same information in a lot more compact form in such a
situation.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.adoc')
| -rw-r--r-- | Documentation/git-merge.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc index 12aa859d16..d53923c3b7 100644 --- a/Documentation/git-merge.adoc +++ b/Documentation/git-merge.adoc @@ -9,7 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [synopsis] -git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] +git merge [-n] [--stat] [--compact-summary] [--no-commit] [--squash] [--[no-]edit] [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] |