Hi Matthieu, Matthieu Moy writes: > I totally agree on the idea, and the implementation is OK. On the > format of the message, you can try to make it more consistent with > other error messages, like: Thanks for the review. > $ git merge branch > error: The following untracked working tree files would be overwritten by merge: > one > two > Please move or remove them before you can merge. > > That would give stg like: > > echo >&2 "error: The following files have unstaged changes:" > git diff-files --name-status -r --ignore-submodules -- >&2 > echo >&2 "Please commit or stash them to proceed." Ok, sounds good. > Also, you probably want to give all the error before you "exit 1", > hence stg like: Hm, is that a good idea? We want the output to be functional and indicative: it should tell the user what to do immediately. I'm afraid that displaying both errors will make the output very verbose. We can just tell the user about the unstaged changes, and wait for them to commit or stash it. Either way, both commit and stash will affect the index by default :) -- Ram -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html