summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 11:42:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 11:42:18 -0800
commit4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e (patch)
treea6fbd54fee0a3d58d91db28da0fa36b4ebb854d9 /t/t7110-reset-merge.sh
parentMerge branch 'jc/parse-date-raw' into maint (diff)
parentadd -e: do not show difference in a submodule that is merely dirty (diff)
downloadtgif-4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e.tar.xz
Merge branch 'js/add-e-submodule-fix' into maint
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions