aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson1-413/+0
2024-01-08Merge branch 'ml/doc-merge-updates'Junio C Hamano1-35/+35
2023-12-20Documentation/git-merge.txt: use backticks for command wrappingMichael Lohmann1-25/+25
2023-12-20Documentation/git-merge.txt: fix reference to synopsisMichael Lohmann1-10/+10
2023-12-15docs: AUTO_MERGE is not that specialJunio C Hamano1-1/+1
2023-10-09documentation: wording improvementsElijah Newren1-1/+1
2023-05-23Documentation: document AUTO_MERGEPhilippe Blain1-2/+7
2023-05-23git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain1-1/+1
2023-01-13git-merge.txt: mention 'ORIG_HEAD' in the DescriptionPhilippe Blain1-1/+2
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano1-1/+4
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason1-1/+4
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano1-4/+1
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano1-1/+7
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano1-1/+7
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-5/+27
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren1-0/+2
2020-05-05Doc: reference the "stash list" in autostash docsDenton Liu1-2/+2
2020-04-10merge: teach --autostash optionDenton Liu1-3/+8
2019-08-07merge: do no-verify like commitMichael J Gruber1-1/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+5
2019-07-09Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano1-2/+1
2019-06-17show --continue/skip etc. consistently in synopsisPhillip Wood1-2/+1
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano1-0/+4
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy1-0/+4
2019-04-02doc: document --overwrite-ignoreNguyễn Thái Ngọc Duy1-0/+5
2019-03-18merge: tweak --rerere-autoupdate documentationPhillip Wood1-1/+2
2018-10-29config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-3/+3
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin1-1/+9
2018-07-11merge: fix misleading pre-merge check documentationElijah Newren1-3/+3
2018-06-18Merge branch 'mw/doc-merge-enumfix'Junio C Hamano1-1/+1
2018-06-14doc: update the order of the syntax `git merge --continue`Meng-Sung Wu1-1/+1
2017-11-06Merge branch 'wk/pull-signoff'Junio C Hamano1-8/+0
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano1-6/+0
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King1-8/+0
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King1-6/+0
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano1-1/+1
2017-08-26Merge branch 'mg/killed-merge'Junio C Hamano1-1/+4
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-08-21Documentation/git-merge: explain --continueMichael J Gruber1-1/+4
2017-07-25merge: add a --signoff flagŁukasz Gryglicki1-0/+8
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano1-6/+1
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham1-0/+8
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano1-13/+1
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano1-0/+13
2015-10-05Merge branch 'mm/keyid-docs'Junio C Hamano1-2/+4
2015-09-21Documentation: explain optional arguments betterMatthieu Moy1-1/+3
2015-09-21Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy1-1/+1
2015-09-17Merge branch 'po/doc-branch-desc'Junio C Hamano1-1/+1
2015-09-14doc: show usage of branch descriptionPhilip Oakley1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-06 18:22:05 +0000