summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2008-10-31 10:12:21 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-10 17:35:58 -0800
commitd3240d935c4b844db71e4570eeedfac4cff73f78 (patch)
treec6ad63efa78ac0133564147be4958280c70b3bc8 /Documentation/git-merge-index.txt
parentc123b7c5fb596d93cd015645212c379fc3c381d5 (diff)
downloadgit-d3240d935c4b844db71e4570eeedfac4cff73f78.tar.gz
filter-branch: add git_commit_non_empty_tree and --prune-empty.
git_commit_non_empty_tree is added to the functions that can be run from commit filters. Its effect is to commit only commits actually touching the tree and that are not merge points either. The option --prune-empty is added. It defaults the commit-filter to 'git_commit_non_empty_tree "$@"', and can be used with any other combination of filters, except --commit-hook that must used 'git_commit_non_empty_tree "$@"' where one puts 'git commit-tree "$@"' usually to achieve the same result. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions