summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
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
2009-10-09Documentation: clarify mergeoptions descriptionLibravatar Jonathan Nieder1-2/+2
2009-10-09Documentation: git fmt-merge-msg does not have to be a scriptLibravatar Jonathan Nieder1-3/+4
2009-08-12Documentation: merge: one <remote> is requiredLibravatar Paul Bolle1-1/+1
2009-03-26Grammar fix for "git merge" man pageLibravatar Wincent Colaiuta1-1/+1
2009-03-25Grammar fixes to "merge" and "patch-id" docsLibravatar Wincent Colaiuta1-1/+1
2009-03-17Documentation: remove extra quoting/emphasis around literal textsLibravatar Chris Johnsen1-3/+3
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-17/+17
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-0/+65
2008-09-04Fix AsciiDoc errors in merge documentationLibravatar Johan Herland1-4/+4
2008-08-31git-merge documentation: describe how conflict is presentedLibravatar Junio C Hamano1-0/+65
2008-08-22git-merge documentation: more details about resolving conflictsLibravatar Dan Hensgen1-6/+18
2008-07-30Make the DESCRIPTION match <x>... items in the SYNOPSISLibravatar Abhijit Menon-Sen1-2/+2
2008-07-21Update my e-mail addressLibravatar Junio C Hamano1-1/+1
2008-07-19Documentation/git-merge.txt: Partial rewrite of How Merge WorksLibravatar Petr Baudis1-47/+29
2008-07-08Documentation: mention ORIG_HEAD in am, merge, and rebaseLibravatar Brian Gernhardt1-1/+3
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupLibravatar Jonathan Nieder1-6/+8
2008-07-01Documentation: be consistent about "git-" versus "git "Libravatar Jonathan Nieder1-5/+5
2008-06-06documentation: move git(7) to git(1)Libravatar Christian Couder1-1/+1
2008-04-12merge, pull: introduce '--(no-)stat' optionLibravatar SZEDER Gábor1-1/+1
2008-04-12doc: moved merge.* config variables into separate merge-config.txtLibravatar SZEDER Gábor1-12/+1
2008-03-03Fix incorrect wording in git-merge.txt.Libravatar Matthieu Moy1-1/+2
2008-01-16Documentation: fix and clarify grammar in git-merge docs.Libravatar Dave Peticolas1-6/+6
2008-01-06Documentation: rename gitlink macro to linkgitLibravatar Dan McGee1-4/+4
2007-12-22Documentation: describe 'union' low-level merge driverLibravatar Junio C Hamano1-1/+2
2007-10-30Merge branch 'maint' into HEADLibravatar Junio C Hamano1-5/+6
2007-10-30git-merge: document but discourage the historical syntaxLibravatar Junio C Hamano1-5/+6
2007-10-03Merge branch 'lh/merge'Libravatar Junio C Hamano1-0/+4
2007-09-25Fix spelling of overridden in documentationLibravatar Shawn Bohrer1-1/+1
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLibravatar Lars Hjemli1-0/+4
2007-08-01Try to be consistent with capitalization in the documentationLibravatar Steve Hoelzer1-5/+5
2007-07-12Update git-merge documentation.Libravatar Jakub Narebski1-0/+15
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:37:55 +0000