summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
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
2007-05-24Add a configuration option to control diffstat after mergeLibravatar Alex Riesen1-1/+1
2007-02-17Convert update-index references in docs to add.Libravatar Shawn O. Pearce1-1/+1
2007-02-12git merge documentation: -m is optionalLibravatar Matthias Lederhofer1-1/+1
2007-01-18Documentation: sync git.txt command list and manual page titleLibravatar Junio C Hamano1-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-6/+0
2006-11-21git-merge: make it usable as the first class UILibravatar Junio C Hamano1-5/+13
2006-07-09Assorted typo fixesLibravatar Pavel Roskin1-1/+1
2005-12-16Examples of resetting.Libravatar Junio C Hamano1-0/+5
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexLibravatar Junio C Hamano1-4/+6
2005-11-28Documentation: Describe merge operation a bit better.Libravatar Junio C Hamano1-0/+95
2005-11-06Refactored merge options into separate merge-options.txt.Libravatar Jon Loeliger1-1/+1
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+2
2005-11-05Documentation: git-fetch/pull updates.Libravatar Junio C Hamano1-1/+1
2005-11-04Documentation: -merge and -pull: describe merge strategies.Libravatar Junio C Hamano1-9/+2
2005-11-01Documentation for git-fmt-merge-msgLibravatar Petr Baudis1-0/+10
2005-10-10Remove the version tags from the manpagesLibravatar Junio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroLibravatar Sergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:11:35 +0000