diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 05:28:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 20:20:39 (GMT) |
| commit | 8c3275abcacb83ea3f4c4f4ceb2376799fc282bd (patch) | |
| tree | e19e547e8802825b6f590b67dcac6442da8d23a6 /Documentation | |
| parent | 63889639bbb47399b5ede784b1afe48679d52bb2 (diff) | |
| download | git-8c3275abcacb83ea3f4c4f4ceb2376799fc282bd.zip git-8c3275abcacb83ea3f4c4f4ceb2376799fc282bd.tar.gz git-8c3275abcacb83ea3f4c4f4ceb2376799fc282bd.tar.bz2 | |
Allow the user to control the verbosity of merge-recursive.
Junio C Hamano <junkio@cox.net> writes:
>
> I think the output from merge-recursive can be categorized into 5
> verbosity levels:
>
> 1. "CONFLICT", "Rename", "Adding here instead due to D/F conflict"
> (outermost)
>
> 2. "Auto-merged successfully" (outermost)
>
> 3. The first "Merging X with Y".
>
> 4. outermost "Merging:\ntitle1\ntitle2".
>
> 5. outermost "found N common ancestors\nancestor1\nancestor2\n..."
> and anything from inner merge.
>
> I would prefer the default verbosity level to be 2 (that is, show
> both 1 and 2).
and this change makes it so. I think level 3 is probably pointless
as its only one line of output above level 2, but I can see how some
users may want to view it but not view the slightly more verbose
output of level 4.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f7dba89..faa17ba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -321,6 +321,13 @@ merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.verbosity:: + Controls the amount of output shown by the recursive merge + strategy. Level 0 outputs nothing except a final error + message if conflicts were detected. Level 1 outputs only + conflicts, 2 outputs conflicts and file changes. Level 5 and + above outputs debugging information. The default is level 2. + pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. |