summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Miklos Vajna <vmiklos@frugalware.org>2008-12-28 00:03:57 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-30 00:03:48 -0800
commitf26c4940c4c7942a95058d9aaef7b01967085a60 (patch)
tree6eaa32badda00996f559d5fa5eb90ec3abd01714 /Documentation/git-merge-tree.txt
parentMerge branch 'lt/reset-merge' (diff)
downloadtgif-f26c4940c4c7942a95058d9aaef7b01967085a60.tar.xz
parse-opt: migrate builtin-apply.
The only incompatible change is that the user how have to use '--' before a patch file if it is named "--build-fake-ancestor=something". Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions