summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)Author
2023-01-13git-merge.txt: mention 'ORIG_HEAD' in the DescriptionPhilippe Blain
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren
2020-05-05Doc: reference the "stash list" in autostash docsDenton Liu
2020-04-10merge: teach --autostash optionDenton Liu
2019-08-07merge: do no-verify like commitMichael J Gruber
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-07-09Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano
2019-06-18show --continue/skip etc. consistently in synopsisPhillip Wood
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy
2019-04-02doc: document --overwrite-ignoreNguyễn Thái Ngọc Duy
2019-03-18merge: tweak --rerere-autoupdate documentationPhillip Wood
2018-10-29config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin
2018-07-11merge: fix misleading pre-merge check documentationElijah Newren
2018-06-18Merge branch 'mw/doc-merge-enumfix'Junio C Hamano
2018-06-14doc: update the order of the syntax `git merge --continue`Meng-Sung Wu
2017-11-06Merge branch 'wk/pull-signoff'Junio C Hamano
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano
2017-08-27Merge branch 'mg/killed-merge'Junio C Hamano
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2017-08-22Documentation/git-merge: explain --continueMichael J Gruber
2017-07-25merge: add a --signoff flagŁukasz Gryglicki
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2015-10-05Merge branch 'mm/keyid-docs'Junio C Hamano
2015-09-21Documentation: explain optional arguments betterMatthieu Moy
2015-09-21Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy
2015-09-17Merge branch 'po/doc-branch-desc'Junio C Hamano
2015-09-14doc: show usage of branch descriptionPhilip Oakley
2015-05-19Merge branch 'jc/merge'Junio C Hamano
2015-04-29merge: drop 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano
2015-03-14*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy
2014-04-22merge: enable defaulttoupstream by defaultFelipe Contreras
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano
2013-10-18git-merge: document the -S optionNicolas Vigier
2013-09-05Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano