summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
AgeCommit message (Expand)Author
2024-01-29merge-tree: accept 3 trees as argumentsJohannes Schindelin
2023-10-09documentation: add missing articleElijah Newren
2023-10-09documentation: fix singular vs. pluralElijah Newren
2023-03-19Merge branch 'as/doc-markup-fix'Junio C Hamano
2023-03-06git-merge-tree.txt: replace spurious HTML entityAndreas Schwab
2022-11-25docs: fix description of the `--merge-base` optionKyle Zhao
2022-11-13merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao
2022-11-13merge-tree.c: add --merge-base=<commit> optionKyle Zhao
2022-10-23merge-tree: support multiple batched merges with --stdinElijah Newren
2022-10-23merge-tree: update documentation for differences in -z outputElijah Newren
2022-06-22git-merge-tree.txt: add a section on potentional usage mistakesElijah Newren
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren
2022-06-22merge-tree: support including merge messages in outputElijah Newren
2022-06-22merge-tree: implement real mergesElijah Newren
2013-09-04use 'tree-ish' instead of 'treeish'Richard Hansen
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-07-02Documentation: be consistent about "git-" versus "git "Jonathan Nieder
2008-06-06documentation: move git(7) to git(1)Christian Couder
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
2007-06-07War on whitespaceJunio C Hamano
2006-04-13Documentation: add a couple of missing docs.Junio C Hamano