summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)Author
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
2013-09-05Documentation/git-merge.txt: fix formatting of example blockAndreas Schwab
2013-07-22Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano
2013-06-18Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy
2013-05-17documentation: trivial style cleanupsFelipe Contreras
2013-04-01Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano
2013-03-28Merge branch 'yd/doc-merge-annotated-tag'Junio C Hamano
2013-03-21Documentation: merging a tag is a special caseJunio C Hamano
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy
2012-07-15doc: A few minor copy edits.Štěpán Němec
2012-01-23merge: use editor by default in interactive sessionsJunio C Hamano
2011-04-02Merge branch 'jc/merge-sans-branch'Junio C Hamano
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland
2010-10-29Fix a formatting error in git-merge.txtNathan W. Panike
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan
2010-04-12Docs: Add -X option to git-merge's synopsis.Marc Branchaud
2010-01-24Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder
2010-01-24Documentation: simplify How Merge WorksJonathan Nieder
2010-01-24Documentation: merge: add a section about fast-forwardJonathan Nieder
2010-01-24Documentation: emphasize when git merge terminates earlyJonathan Nieder
2010-01-24Documentation: merge: add an overviewJonathan Nieder
2010-01-24Documentation: merge: move merge strategy list to endJonathan Nieder
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder
2010-01-24Documentation: merge: move configuration section to endJonathan Nieder
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2010-01-10Documentation: format full commands in typewriter fontThomas Rast
2010-01-09Documentation: warn prominently against merging with dirty treesThomas Rast
2010-01-09Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 19:24:27 (GMT)