| commit | f34a9416ab9efa13a53a31cabd9061d583aaba7e | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Tue, 12 Aug 2008 08:45:59 +0000 (12 10:45 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Aug 2008 00:27:46 +0000 (12 17:27 -0700) | ||
| tree | 99faf959a211bdce3cd9a021ef50e56e3f0a190b | treesnapshot (tar.gz zip) |
| parent | 5b2eeed1ba36caf71341c1557f2054681c353a14 | commitdiff |
filter-branch: use --simplify-merges
Use rev-list --simplify-merges everywhere. This changes the behaviour
of --subdirectory-filter in cases such as
O -- A -\
\ \
\- B -- M
where A and B bring the same changes to the subdirectory: It now keeps
both sides of the merge. Previously, the history would have been
simplified to 'O -- A'. Merges of unrelated side histories that never
touch the subdirectory are still removed.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use rev-list --simplify-merges everywhere. This changes the behaviour
of --subdirectory-filter in cases such as
O -- A -\
\ \
\- B -- M
where A and B bring the same changes to the subdirectory: It now keeps
both sides of the merge. Previously, the history would have been
simplified to 'O -- A'. Merges of unrelated side histories that never
touch the subdirectory are still removed.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-filter-branch.sh | diffblobblamehistory |