![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Wed, 30 Dec 2009 05:54:46 +0000 (06:54 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Dec 2009 09:09:46 +0000 (01:09 -0800) | ||
| commit | c93966906f5d578d06eee0ead8745e608a6e18cf | |
| tree | ea2c9764283e8b7d73452e117d47e1c3ad841e47 | tree | snapshot |
| parent | 4086010c7c83d907321ae1357569dfcc01710cb6 | commit | diff |
reset: add a few tests for "git reset --merge"
Commit 9e8eceab ("Add 'merge' mode to 'git reset'", 2008-12-01),
added the --merge option to git reset, but there were no test cases
for it.
This was not a big problem because "git reset" was just forking and
execing "git read-tree", but this will change in a following patch.
So let's add a few test cases to make sure that there will be no
regression.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit 9e8eceab ("Add 'merge' mode to 'git reset'", 2008-12-01),
added the --merge option to git reset, but there were no test cases
for it.
This was not a big problem because "git reset" was just forking and
execing "git read-tree", but this will change in a following patch.
So let's add a few test cases to make sure that there will be no
regression.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7110-reset-merge.sh | [new file with mode: 0755] | blob |