summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* git-merge.txt: mention 'ORIG_HEAD' in the DescriptionPhilippe Blain2023-01-131-1/+2
* Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano2022-09-141-1/+4
|\
| * docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason2022-09-071-1/+4
* | doc: consolidate --rerere-autoupdate descriptionJunio C Hamano2022-08-031-4/+1
|/
* Merge branch 'jc/merge-detached-head-name'Junio C Hamano2022-01-051-1/+7
|\
| * merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-1/+7
* | update documentation for new zdiff3 conflictStyleElijah Newren2021-12-011-5/+27
|/
* pull: update docs & code for option compatibility with rebasingElijah Newren2021-07-221-0/+2
* Doc: reference the "stash list" in autostash docsDenton Liu2020-05-051-2/+2
* merge: teach --autostash optionDenton Liu2020-04-101-3/+8
* merge: do no-verify like commitMichael J Gruber2019-08-071-1/+1
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-0/+5
|\
| * doc: document --overwrite-ignoreNguyễn Thái Ngọc Duy2019-04-021-0/+5
* | Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano2019-07-091-2/+1
|\ \
| * | show --continue/skip etc. consistently in synopsisPhillip Wood2019-06-171-2/+1
* | | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-0/+4
|\ \ \ | |/ /
| * | merge: add --quitNguyễn Thái Ngọc Duy2019-05-191-0/+4
| |/
* | merge: tweak --rerere-autoupdate documentationPhillip Wood2019-03-181-1/+2
|/
* config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
* Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-021-3/+3
|\
| * merge: fix misleading pre-merge check documentationElijah Newren2018-07-111-3/+3
* | merge: allow reading the merge commit message from a fileJohannes Schindelin2018-07-111-1/+9
* | Merge branch 'mw/doc-merge-enumfix'Junio C Hamano2018-06-181-1/+1
|\ \ | |/ |/|
| * doc: update the order of the syntax `git merge --continue`Meng-Sung Wu2018-06-141-1/+1
* | Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-061-8/+0
|\ \
| * | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-131-8/+0
* | | Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2017-10-191-6/+0
|\ \ \ | |/ / |/| |
| * | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'wk/merge-options-gpg-sign-docW. Trevor King2017-10-121-6/+0
* | | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \ \
| * | | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
| | |/ | |/|
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-1/+4
|\ \ \ | | |/ | |/|
| * | Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
| |/
* | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-251-0/+8
|/
* Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano2017-03-301-6/+1
|\
| * merge: drop 'git merge <message> HEAD <commit>' syntaxjc/merge-drop-old-syntaxJunio C Hamano2015-04-291-6/+1
* | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+8
* | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-13/+1
* | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-0/+13
* | Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-051-2/+4
|\ \
| * | Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-211-1/+3
| * | Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-211-1/+1
* | | Merge branch 'po/doc-branch-desc'Junio C Hamano2015-09-171-1/+1
|\ \ \ | |/ / |/| |
| * | doc: show usage of branch descriptionpo/doc-branch-descPhilip Oakley2015-09-141-1/+1
* | | Merge branch 'jc/merge'Junio C Hamano2015-05-191-0/+4
|\ \ \ | | |/ | |/|
| * | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-0/+4
| |/
* | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-2/+2
|/
* merge: enable defaulttoupstream by defaultfc/merge-default-to-upstreamFelipe Contreras2014-04-221-3/+2
* parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
* git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3Junio C Hamano2013-09-051-2/+2
|\
View Lorry Controller Status