summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:21:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:21:17 -0700
commitfdb70b16a006f82b65fb92995886a074c829f587 (patch)
treec13700374eccda4783aefbab2b1c6e54addf90f3 /git-gui/lib/merge.tcl
parentMerge branch 'jc/verify-loose-object-header' into maint (diff)
parentworktree: honor configuration variables (diff)
downloadtgif-fdb70b16a006f82b65fb92995886a074c829f587.tar.xz
Merge branch 'jc/worktree-config' into maint
"git worktree", even though it used the default_abbrev setting that ought to be affected by core.abbrev configuration variable, ignored the variable setting. The command has been taught to read the default set of configuration variables to correct this. * jc/worktree-config: worktree: honor configuration variables
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions