summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'as/doc-markup-fix'Junio C Hamano2023-03-191-1/+1
|\
| * git-merge-tree.txt: replace spurious HTML entityAndreas Schwab2023-03-061-1/+1
* | docs: fix description of the `--merge-base` optionKyle Zhao2022-11-251-2/+2
* | merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao2022-11-121-1/+13
* | merge-tree.c: add --merge-base=<commit> optionKyle Zhao2022-11-121-0/+4
|/
* merge-tree: support multiple batched merges with --stdinElijah Newren2022-10-221-1/+29
* merge-tree: update documentation for differences in -z outputElijah Newren2022-10-221-7/+39
* git-merge-tree.txt: add a section on potentional usage mistakesElijah Newren2022-06-221-0/+53
* merge-tree: add a --allow-unrelated-histories flagElijah Newren2022-06-221-0/+5
* merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren2022-06-221-4/+17
* merge-tree: provide easy access to `ls-files -u` style infoElijah Newren2022-06-221-6/+28
* merge-tree: provide a list of which files have conflictsElijah Newren2022-06-221-0/+9
* merge-tree: support including merge messages in outputElijah Newren2022-06-221-6/+41
* merge-tree: implement real mergesElijah Newren2022-06-221-12/+86
* use 'tree-ish' instead of 'treeish'Richard Hansen2013-09-041-1/+1
* Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
* doc: drop author/documentation sections from most pagesJeff King2011-03-111-8/+0
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-3/+3
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-1/+1
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-1/+1
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Documentation: add a couple of missing docs.Junio C Hamano2006-04-131-0/+37
View Lorry Controller Status