| commit | d347cee4deda2e740f3c9e0046a86b46debdaeb8 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 5 Aug 2010 11:11:12 +0000 (5 06:11 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Aug 2010 16:20:00 +0000 (6 09:20 -0700) | ||
| tree | 43fe13da6fadea23ef5ba7aa572b7a31611f10e6 | treesnapshot (tar.gz zip) |
| parent | 18acb30ee458a4a413d987215af41b4a76643f5d | commitdiff |
t6038 (merge.renormalize): try checkout -m and cherry-pick
checkout -m and cherry-pick have not been wired up to respect
merge.renormalize, but a naïve user would not know that.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
checkout -m and cherry-pick have not been wired up to respect
merge.renormalize, but a naïve user would not know that.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6038-merge-text-auto.sh | diffblobblamehistory |