summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-01-08 05:45:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-09 23:38:43 -0800
commitd7eed8cbef2d15e87e9002f5e3ce08830b40b292 (patch)
tree30050ccde870d1b1bc4724d2ab6881647c951c01 /Documentation/merge-config.txt
parentDocumentation: reset: add some missing tables (diff)
downloadtgif-d7eed8cbef2d15e87e9002f5e3ce08830b40b292.tar.xz
t7111: check that reset options work as described in the tables
Some previous patches added some tables to the "git reset" documentation. These tables describe the behavior of "git reset" depending on the option it is passed and the state of the files in the working tree, the index, HEAD and the target commit. This patch adds some tests to make sure that the tables describe the behavior of "git reset". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions