diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-10-07 18:09:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-07 09:29:31 -0700 |
| commit | d8cc92ab13e438f225770843868ae5a58c6bb357 (patch) | |
| tree | 63b17084673cc94a072919babeab9314e3b02aab /builtin | |
| parent | 41a5dd6d8622a67216978131e394148c7fa58b19 (diff) | |
| download | git-d8cc92ab13e438f225770843868ae5a58c6bb357.tar.gz git-d8cc92ab13e438f225770843868ae5a58c6bb357.tar.xz | |
wt-status: teach has_{unstaged,uncommitted}_changes() about submodules
Sometimes we are *actually* interested in those changes... For
example when an interactive rebase wants to continue with a staged
submodule update.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 01b64654c..d6e46ee6d 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (!autostash) require_clean_work_tree(N_("pull with rebase"), - _("please commit or stash them."), 0); + _("please commit or stash them."), 1, 0); if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs)) hashclr(rebase_fork_point); |