![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 7 Feb 2009 19:09:48 +0000 (11:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 7 Feb 2009 19:09:48 +0000 (11:09 -0800) |
* js/filter-branch-submodule:
filter-branch: do not consider diverging submodules a 'dirty worktree'
filter-branch: Fix fatal error on bare repositories
filter-branch: do not consider diverging submodules a 'dirty worktree'
filter-branch: Fix fatal error on bare repositories
| 1 | 2 | |||
|---|---|---|---|---|
| git-filter-branch.sh | patch | | diff1 | | diff2 | | blob | history |
| t/t7003-filter-branch.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-filter-branch.sh
Simple merge
diff --cc t/t7003-filter-branch.sh
Simple merge