diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 04:43:43 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 04:43:43 -0500 |
| commit | c539449b2df0381de1d34c70b093b68370e89a4e (patch) | |
| tree | 82f534be9e3ccaa7a69ff5cd2b24ba7444c92a3f /contrib/persistent-https | |
| parent | 729a6f60ddd0b3317c581a01687a32e585fa0c3e (diff) | |
| download | git-c539449b2df0381de1d34c70b093b68370e89a4e.tar.gz git-c539449b2df0381de1d34c70b093b68370e89a4e.zip | |
git-gui: Support merge.summary, merge.verbosity.
Changed our private merge summary config option to be the same as the
merge.summary option supported by core Git. This means setting the
"Show Merge Summary" flag in git-gui will have the same effect on
the command line.
In the same vein I've also added merge.verbosity to the gui options,
allowing the user to adjust the verbosity level of the recursive
merge strategy. I happen to like level 1 and suggest that other users
use that, but level 2 is the core Git default right now so we'll use
the same default in git-gui.
Unfortunately it appears as though core Git has broken support for
the merge.summary option, even though its still in the documentation
For the time being we should pass along --no-summary to git-merge if
merge.summary is false.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions