summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-16 23:29:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-16 23:29:32 -0700
commit1776a710d615c77e3c66be2f4a08c36663f88a07 (patch)
treef19ebe6b05a8a73dcad416b30ca547cbbf0d8c5c /Documentation/git-reset.txt
parentMerge branch 'qp/bisect-docfix' (diff)
parentdiff: submodule inline diff to initialize env array. (diff)
downloadtgif-1776a710d615c77e3c66be2f4a08c36663f88a07.tar.xz
Merge branch 'sb/show-diff-for-submodule-in-diff-fix'
"git diff --submodule=diff" learned to work better in a project with a submodule that in turn has its own submodules. * sb/show-diff-for-submodule-in-diff-fix: diff: submodule inline diff to initialize env array.
Diffstat (limited to 'Documentation/git-reset.txt')
0 files changed, 0 insertions, 0 deletions