summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-12-30 06:54:45 +0100
committerJunio C Hamano <gitster@pobox.com>2009-12-30 01:09:45 -0800
commit4086010c7c83d907321ae1357569dfcc01710cb6 (patch)
treee4c9b5e091b162a592eba97ce5e66a89096b1fc5 /t/t7110-reset-merge.sh
parent2b06b0a02f8d0aa01c8ff19b72c9292afd7a84fe (diff)
downloadgit-4086010c7c83d907321ae1357569dfcc01710cb6.tar.gz
Documentation: reset: add some tables to describe the different options
This patch adds a DISCUSSION section that contains some tables to show how the different "git reset" options work depending on the states of the files in the working tree, the index, HEAD and the target commit. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions