summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-11-10 22:04:51 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-13 11:26:43 -0800
commitf2f3a6b802e3dae09a1c414cd8516ff2a546a527 (patch)
treeca23c536248b2861bca602b5b6d5c32863a8f7a2 /Documentation/git-merge.txt
parentfilter-branch: stop special-casing $filter_subdir argument (diff)
downloadtgif-f2f3a6b802e3dae09a1c414cd8516ff2a546a527.tar.xz
filter-branch: nearest-ancestor rewriting outside subdir filter
Since a0e4639 (filter-branch: fix ref rewriting with --subdirectory-filter, 2008-08-12) git-filter-branch has done nearest-ancestor rewriting when using a --subdirectory-filter. However, that rewriting strategy is also a useful building block in other tasks. For example, if you want to split out a subset of files from your history, you would typically call git filter-branch -- <refs> -- <files> But this fails for all refs that do not point directly to a commit that affects <files>, because their referenced commit will not be rewritten and the ref remains untouched. The code was already there for the --subdirectory-filter case, so just introduce an option that enables it independently. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions