git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18acb30)
t6038 (merge.renormalize): try checkout -m and cherry-pick
authorJonathan Nieder <redacted>
Thu, 5 Aug 2010 11:11:12 +0000 (06:11 -0500)
committerJunio C Hamano <redacted>
Fri, 6 Aug 2010 16:20:00 +0000 (09:20 -0700)
commitd347cee4deda2e740f3c9e0046a86b46debdaeb8
tree43fe13da6fadea23ef5ba7aa572b7a31611f10e6tree | snapshot
parent18acb30ee458a4a413d987215af41b4a76643f5dcommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6038-merge-text-auto.sh diff | blob | history
git clone https://git.99rst.org/PROJECT