Hi, On Tue, 24 Jul 2007, Johannes Schindelin wrote: > > When a squashing merge failed, the first commit would not be replaced, > due to "git reset --soft" being called with an unmerged index. > > Noticed by Uwe Kleine-König. Unfortunately, no Ack from him. However, I have tested it myself (even unwantedly, when working on the work-tree sanitising, and it bit me again; I run "master"+branch--new-workdir ATM). Junio, please apply... Ciao, Dscho
