diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2008-08-12 10:45:59 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-12 17:27:46 -0700 |
| commit | f34a9416ab9efa13a53a31cabd9061d583aaba7e (patch) | |
| tree | 99faf959a211bdce3cd9a021ef50e56e3f0a190b /archive.c | |
| parent | Merge branch 'jc/post-simplify' into tr/filter-branch (diff) | |
| download | tgif-f34a9416ab9efa13a53a31cabd9061d583aaba7e.tar.xz | |
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>
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions