reset: disallow using --keep when there are unmerged entries
authorChristian Couder <chriscool@tuxfamily.org>
Tue, 19 Jan 2010 04:26:01 +0000 (05:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 04:06:50 +0000 (20:06 -0800)
commit812d2a3...61b1bbb1931aff2ed6d2a17e939f5bf2
tree8a4b55f...54c0b5f9fe4a4ebfd226e79b949df17dcopy hash to clipboard (tree)
parentab892a1...e83edd1cf9a767bc09d3239f72469d05copy hash to clipboard (diff)
Documentation/git-reset.txt
builtin-reset.c
t/t7110-reset-merge.sh
t/t7111-reset-table.sh