diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-13 14:33:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-13 14:33:19 -0800 |
| commit | aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d (patch) | |
| tree | 8e9410d69333688d32ccab097beaa48b10850833 /wt-status.c | |
| parent | 41e2edf41a6d501f1b8beca7f1f0bcbe9296dcc2 (diff) | |
| parent | d8e87570c32b190af3991d180f37adb8cf5eb99c (diff) | |
| download | git-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.tar.gz git-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.tar.xz | |
Merge branch 'maint'
* maint:
config: add test cases for empty value and no value config variables.
cvsimport: have default merge regex also match beginning of commit message
git clone -s documentation: force a new paragraph for the NOTE
status: suggest "git rm --cached" to unstage for initial commit
Protect get_author_ident_from_commit() from filenames in work tree
upload-pack: Initialize the exec-path.
bisect: use verbatim commit subject in the bisect log
git-cvsimport.txt: fix '-M' description.
Revert "pack-objects: only throw away data during memory pressure"
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index f14022f2a..0b060934e 100644 --- a/wt-status.c +++ b/wt-status.c @@ -60,7 +60,7 @@ static void wt_status_print_cached_header(struct wt_status *s) { const char *c = color(WT_STATUS_HEADER); color_fprintf_ln(s->fp, c, "# Changes to be committed:"); - if (s->reference) { + if (!s->is_initial) { color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference); } else { color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)"); |