diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
| commit | c9c6cc8d7db312b9e8502f8d55422b8309cde2f3 (patch) | |
| tree | f13048eaaa0dd450171d2bce68ebe17e7c3a1847 /builtin-checkout.c | |
| parent | baede9f803ff7becab815481b004bc983d0422c7 (diff) | |
| parent | 93feb4bb14dbd5c89701d6f2b0ab3d83dbc999c5 (diff) | |
| download | git-c9c6cc8d7db312b9e8502f8d55422b8309cde2f3.tar.gz | |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
checkout: Do not show local changes when in quiet mode
for-each-ref: Fix --format=%(subject) for log message without newlines
git-stash.sh: don't default to refs/stash if invalid ref supplied
maint: check return of split_cmdline to avoid bad config strings
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 4497b7092d..9a0c173c14 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -328,7 +328,7 @@ static int merge_working_tree(struct checkout_opts *opts, commit_locked_index(lock_file)) die("unable to write new index file"); - if (!opts->force) + if (!opts->force && !opts->quiet) show_local_changes(&new->commit->object); return 0; |