summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:22 -0700
commit6560584494a8053431d0c8e90b78d50f71c8055b (patch)
tree58b98a1dfccd4cce516f15effaa77652cfe7dc05 /mergetools/winmerge
parentMerge branch 'jk/make-findstring-makeflags-fix' (diff)
parentDocumentation/git-rebase: fix --no-autostash formatting (diff)
downloadtgif-6560584494a8053431d0c8e90b78d50f71c8055b.tar.xz
Merge branch 'jk/rebase-no-autostash'
There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions