path: root/wt-status.h
diff options
authorJunio C Hamano <>2009-12-12 07:53:41 (GMT)
committerJunio C Hamano <>2009-12-12 09:22:10 (GMT)
commit3c5884536563518ce6cd4dc782b0ebb670bf3b6d (patch)
tree2b6aa09fe2d8eb5e2f57e9517c327d0dd50b677a /wt-status.h
parentdd20f8af1ae54773569b78b1b71d1ea663705d2c (diff)
status/commit: do not suggest "reset HEAD <path>" while merging
Suggesting "'reset HEAD <path>' to unstage" is dead wrong if we are about to record a merge commit. For either an unmerged path (i.e. with unresolved conflicts), or an updated path, it would result in discarding what the other branch did. Note that we do not do anything special in a case where we are amending a merge. The user is making an evil merge starting from an already committed merge, and running "reset HEAD <path>" is the right way to get rid of the local edit that has been added to the index. Once "reset --unresolve <path>" becomes available, we might want to suggest it for a merged path that has unresolve information, but until then, just remove the incorrect advice. We might also want to suggest "checkout --conflict <path>" to revert the file in the work tree to the state of failed automerge for an unmerged path, but we never did that, and this commit does not change that. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'wt-status.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index a4bddcf..c60f40a 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -34,6 +34,7 @@ struct wt_status {
const char **pathspec;
int verbose;
int amend;
+ int in_merge;
int nowarn;
int use_color;
int relative_paths;