diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-11 16:50:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-11 16:50:36 -0800 |
| commit | e861ce1692fa9809f3e7b898804f8ddaf7cd8975 (patch) | |
| tree | 1d812c3d71bab1fcf45fa09f03da21cd01c985ba /git-pull.sh | |
| parent | 141d21b8256ef96bbd693fd35e154787365e26dc (diff) | |
| parent | 7eff28a9b42cb0d3aad932338b2e645fc6ed8fa9 (diff) | |
| download | git-e861ce1692fa9809f3e7b898804f8ddaf7cd8975.tar.gz | |
Merge branch 'jc/bare'
* jc/bare:
Disallow working directory commands in a bare repository.
git-fetch: allow updating the current branch in a bare repository.
Introduce is_bare_repository() and core.bare configuration variable
Move initialization of log_all_ref_updates
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index c184fb81a4..e9826fc4ce 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -8,6 +8,7 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <rep LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' . git-sh-setup set_reflog_action "pull $*" +require_work_tree test -z "$(git ls-files -u)" || die "You are in a middle of conflicted merge." |