Re: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Paul Tan pyoka...@gmail.com writes: (In addition, I fixed a small mistake with the struct tree_desc array size.) Yeah, one thing I forgot to mention was that I suspect this kind of oneway merge already in other places in the code, and a future mini-project might be to inspect them all and try

[PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

a test for that too. (In addition, I fixed a small mistake with the struct tree_desc array size.) Thanks, Paul -- 8 -- Subject: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index After running git am --abort, and then running git reset --hard, files that were not modified would