summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Libravatar Chris Packham1-0/+8
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Libravatar Junio C Hamano1-13/+1
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-0/+13
2015-10-05Merge branch 'mm/keyid-docs'Libravatar Junio C Hamano1-2/+4
2015-09-21Documentation: explain optional arguments betterLibravatar Matthieu Moy1-1/+3
2015-09-21Documentation: use 'keyid' consistently, not 'key-id'Libravatar Matthieu Moy1-1/+1
2015-09-17Merge branch 'po/doc-branch-desc'Libravatar Junio C Hamano1-1/+1
2015-09-14doc: show usage of branch descriptionLibravatar Philip Oakley1-1/+1
2015-05-19Merge branch 'jc/merge'Libravatar Junio C Hamano1-0/+4
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano1-0/+4
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2014-04-22merge: enable defaulttoupstream by defaultLibravatar Felipe Contreras1-3/+2
2014-03-24parse-options: multi-word argh should use dash to separate wordsLibravatar Junio C Hamano1-1/+1
2013-10-18git-merge: document the -S optionLibravatar Nicolas Vigier1-1/+5
2013-09-05Merge branch 'maint-1.8.2' into maint-1.8.3Libravatar Junio C Hamano1-2/+2
2013-09-05Documentation/git-merge.txt: fix formatting of example blockLibravatar Andreas Schwab1-2/+2
2013-07-21Merge branch 'mm/merge-in-dirty-worktree-doc' into maintLibravatar Junio C Hamano1-2/+2
2013-06-18Documentation/git-merge.txt: weaken warning about uncommited changesLibravatar Matthieu Moy1-2/+2
2013-05-17documentation: trivial style cleanupsLibravatar Felipe Contreras1-2/+1
2013-04-01Merge branch 'yd/doc-merge-annotated-tag' into maintLibravatar Junio C Hamano1-0/+24
2013-03-28Merge branch 'yd/doc-merge-annotated-tag'Libravatar Junio C Hamano1-0/+24
2013-03-21Documentation: merging a tag is a special caseLibravatar Junio C Hamano1-0/+24
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-2/+2
2012-10-25Documentation: remote tracking branch -> remote-tracking branchLibravatar Matthieu Moy1-1/+1
2012-07-14doc: A few minor copy edits.Libravatar Štěpán Němec1-1/+1
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano1-1/+1
2011-04-01Merge branch 'jc/merge-sans-branch'Libravatar Junio C Hamano1-3/+8
2011-03-24merge: merge with the default upstream branch without argumentLibravatar Junio C Hamano1-3/+8
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-9/+0
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano1-3/+24
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Libravatar Johan Herland1-3/+24
2010-10-29Fix a formatting error in git-merge.txtLibravatar Nathan W. Panike1-7/+7
2010-05-10merge: --log appends shortlog to message if specifiedLibravatar Tay Ray Chuan1-1/+6
2010-04-12Docs: Add -X option to git-merge's synopsis.Libravatar Marc Branchaud1-1/+2
2010-01-24Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastLibravatar Junio C Hamano1-78/+100
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchLibravatar Jonathan Nieder1-6/+8
2010-01-24Documentation: simplify How Merge WorksLibravatar Jonathan Nieder1-36/+16
2010-01-24Documentation: merge: add a section about fast-forwardLibravatar Jonathan Nieder1-13/+18
2010-01-24Documentation: emphasize when git merge terminates earlyLibravatar Jonathan Nieder1-10/+21
2010-01-24Documentation: merge: add an overviewLibravatar Jonathan Nieder1-2/+26
2010-01-24Documentation: merge: move merge strategy list to endLibravatar Jonathan Nieder1-2/+2
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionLibravatar Jonathan Nieder1-3/+3
2010-01-24Documentation: merge: move configuration section to endLibravatar Jonathan Nieder1-9/+9
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Libravatar Junio C Hamano1-25/+29
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-3/+3
2010-01-10Documentation: format full commands in typewriter fontLibravatar Thomas Rast1-7/+7
2010-01-09Documentation: warn prominently against merging with dirty treesLibravatar Thomas Rast1-0/+4
2010-01-09Documentation/git-merge: reword references to "remote" and "pull"Libravatar Thomas Rast1-17/+17
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-1/+6
2009-10-21modernize fetch/merge/pull examplesLibravatar Clemens Buchacher1-0/+33
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:34:50 +0000