diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-09 15:56:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 15:56:17 -0800 |
| commit | 66ecd2d05306fccc65e8d6a5f49100840ea7d3b6 (patch) | |
| tree | 159eaf1f118e602f3a397ede9dc2b386a96b627a /wt-status.c | |
| parent | 75618f1106b95defafca698d5cfdfd3dfb3a7e3c (diff) | |
| parent | 37f7a8579363a98efc48dfb6964a519034fc9acc (diff) | |
| download | git-66ecd2d05306fccc65e8d6a5f49100840ea7d3b6.tar.gz | |
Merge branch 'js/cherry-pick-usability'
* js/cherry-pick-usability:
Teach commit about CHERRY_PICK_HEAD
bash: teach __git_ps1 about CHERRY_PICK_HEAD
Introduce CHERRY_PICK_HEAD
t3507: introduce pristine-detach helper
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index a82b11d341..4daa8bb524 100644 --- a/wt-status.c +++ b/wt-status.c @@ -60,7 +60,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s) color_fprintf_ln(s->fp, c, "# Unmerged paths:"); if (!advice_status_hints) return; - if (s->in_merge) + if (s->whence != FROM_COMMIT) ; else if (!s->is_initial) color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference); @@ -77,7 +77,7 @@ static void wt_status_print_cached_header(struct wt_status *s) color_fprintf_ln(s->fp, c, "# Changes to be committed:"); if (!advice_status_hints) return; - if (s->in_merge) + if (s->whence != FROM_COMMIT) ; /* NEEDSWORK: use "git reset --unresolve"??? */ else if (!s->is_initial) color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference); |