diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2007-06-08 23:28:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-06-09 12:24:16 -0700 |
| commit | cfabd6eee1745cfec58cfcb794ce8847e43b888a (patch) | |
| tree | 0bac5625b6d7f25e3411c3b98b0c60f069d24582 /t/t4001-diff-rename.sh | |
| parent | filter-branch: Simplify parent computation. (diff) | |
| download | tgif-cfabd6eee1745cfec58cfcb794ce8847e43b888a.tar.xz | |
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>
Diffstat (limited to 't/t4001-diff-rename.sh')
0 files changed, 0 insertions, 0 deletions