Sometimes when applying a change to a branch (with `A') I'll get a file in the “unmerged” section. This last time it was a new file. `s' has no effect on it and `k' gets me a message like “can't discard <filename>.” `M-! git add <filename> RET” works just fine, and then I can discard it with `k'. `s' is adding a “-u” argument to the command line it generates. This seems like some kind of a bug to me.
-- Dave Abrahams Meet me at BoostCon: http://www.boostcon.com BoostPro Computing http://www.boostpro.com
