aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.adoc (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-07-14Merge branch 'ts/merge-orig-head-doc-fix'Junio C Hamano1-5/+5
2025-07-07docs: correct ORIG_HEAD example in "git merge" documentationTimur Sultanaev1-5/+5
2025-06-13merge/pull: add the "--compact-summary" optionJunio C Hamano1-1/+1
2025-05-27doc: convert git-merge manpage to new styleJean-Noël Avila1-26/+25
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson1-0/+413