diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-29 01:06:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-29 01:06:57 (GMT) |
| commit | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch) | |
| tree | 88de4825ce11d7eaed4719b0b9db1d0e649f9107 /git-filter-branch.sh | |
| parent | b3a4f8586b4ffa6c896cf0afb2ea49d64faf81ad (diff) | |
| parent | 38762c47d6442dc0ce0f45533f9151877c485337 (diff) | |
| download | git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.zip git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.gz git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.bz2 | |
Merge branch 'maint'
* maint:
scripts: do not get confused with HEAD in work tree
Improve description of git-branch -d and -D in man page.
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 19cab5a..674a25d 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -98,7 +98,7 @@ OPTIONS_SPEC= . git-sh-setup git diff-files --quiet && - git diff-index --cached --quiet HEAD || + git diff-index --cached --quiet HEAD -- || die "Cannot rewrite branch(es) with a dirty working directory." tempdir=.git-rewrite |