| commit | cfabd6eee1745cfec58cfcb794ce8847e43b888a | |
| author | Johannes Sixt <johannes.sixt@telecom.at> | |
| Fri, 8 Jun 2007 21:28:50 +0000 (8 23:28 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 Jun 2007 19:24:16 +0000 (9 12:24 -0700) | ||
| tree | 0bac5625b6d7f25e3411c3b98b0c60f069d24582 | treesnapshot (tar.gz zip) |
| parent | 813b4734fcb82e541658b33b8563387c197d6247 | commitdiff |
filter-branch: subdirectory filter needs --full-history
When two branches are merged that modify a subdirectory (possibly in
different intermediate steps) such that both end up identical, then
rev-list chooses only one branch. But when we filter history, we want to
keep both branches. Therefore, we must use --full-history.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When two branches are merged that modify a subdirectory (possibly in
different intermediate steps) such that both end up identical, then
rev-list chooses only one branch. But when we filter history, we want to
keep both branches. Therefore, we must use --full-history.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-filter-branch.sh | diffblobblamehistory | |
| t/t7003-filter-branch.sh | diffblobblamehistory |