diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
| commit | 0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch) | |
| tree | 999ed87a9453af4848bf98a3341ceaf0801c6f95 /Documentation/merge-options.txt | |
| parent | edf9d719d1d05c1eb4f652782febfdfede212648 (diff) | |
| parent | bebd2fd77d385f198017fe297a6c79e26b2bf61c (diff) | |
| download | git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.gz git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.xz | |
Merge branch 'jk/merge-rename-ux'
* jk/merge-rename-ux:
pull: propagate --progress to merge
merge: enable progress reporting for rename detection
add inexact rename detection progress infrastructure
commit: stop setting rename limit
bump rename limit defaults (again)
merge: improve inexact rename limit warning
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index e33e0f8e1..b613d4ed0 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -75,9 +75,17 @@ option can be used to override --squash. ifndef::git-pull[] -q:: --quiet:: - Operate quietly. + Operate quietly. Implies --no-progress. -v:: --verbose:: Be verbose. + +--progress:: +--no-progress:: + Turn progress on/off explicitly. If neither is specified, + progress is shown if standard error is connected to a terminal. + Note that not all merge strategies may support progress + reporting. + endif::git-pull[] |