summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 14:04:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 14:04:59 -0700
commit9526473f110338d23524ea663eb282a36c7fe4f3 (patch)
tree3c453cb4d879678b9998082dc2eb0ca560863b5e /mergetools/p4merge
parentMerge branch 'da/difftool-git-files' into maint (diff)
parentclean: simplify dir/not-dir logic (diff)
downloadtgif-9526473f110338d23524ea663eb282a36c7fe4f3.tar.xz
Merge branch 'jk/clean-d-pathspec' into maint
"git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d"
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions