Code

git-gui: Expose the merge.diffstat configuration option
authorShawn O. Pearce <spearce@spearce.org>
Mon, 28 May 2007 21:58:07 +0000 (17:58 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 28 May 2007 21:58:07 +0000 (17:58 -0400)
commitfc8ce406fac73536a14611ce871a06db5a5a22b3
treee05bb69caa62acae0a831ffb1d39aa5cd8b58765
parentaa252f194b6a32240117ef339631f42842b6d5b4
git-gui: Expose the merge.diffstat configuration option

Recently git-merge learned to avoid generating the diffstat after
a merge by reading the merge.diffstat configuration option.  By
default this option is assumed to be true, as that is the old
behavior.  However we can force it to false by setting it as a
standard boolean option.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh
lib/option.tcl