summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-25/+29
|\
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-3/+3
| * Documentation: format full commands in typewriter fontThomas Rast2010-01-101-7/+7
| * Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-091-0/+4
| * Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-091-17/+17
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+6
|/
* modernize fetch/merge/pull examplesClemens Buchacher2009-10-211-0/+33
* Documentation: clarify mergeoptions descriptionJonathan Nieder2009-10-091-2/+2
* Documentation: git fmt-merge-msg does not have to be a scriptJonathan Nieder2009-10-091-3/+4
* Documentation: merge: one <remote> is requiredPaul Bolle2009-08-121-1/+1
* Grammar fix for "git merge" man pageWincent Colaiuta2009-03-261-1/+1
* Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta2009-03-251-1/+1
* Documentation: remove extra quoting/emphasis around literal textsChris Johnsen2009-03-171-3/+3
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-17/+17
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+65
|\
| * Fix AsciiDoc errors in merge documentationJohan Herland2008-09-041-4/+4
| * git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-311-0/+65
* | git-merge documentation: more details about resolving conflictsDan Hensgen2008-08-221-6/+18
|/
* Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen2008-07-301-2/+2
* Update my e-mail addressJunio C Hamano2008-07-211-1/+1
* Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis2008-07-191-47/+29
* Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-081-1/+3
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-8/+8
* Documentation formatting and cleanupJonathan Nieder2008-07-011-6/+8
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-5/+5
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-121-1/+1
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-121-12/+1
* Fix incorrect wording in git-merge.txt.Matthieu Moy2008-03-031-1/+2
* Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas2008-01-161-6/+6
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-4/+4
* Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-221-1/+2
* Merge branch 'maint' into HEADJunio C Hamano2007-10-301-5/+6
|\
| * git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-301-5/+6
* | Merge branch 'lh/merge'Junio C Hamano2007-10-031-0/+4
|\ \ | |/ |/|
| * git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-231-0/+4
* | Fix spelling of overridden in documentationShawn Bohrer2007-09-251-1/+1
|/
* Try to be consistent with capitalization in the documentationSteve Hoelzer2007-08-011-5/+5
* Update git-merge documentation.Jakub Narebski2007-07-121-0/+15
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-1/+1
* Convert update-index references in docs to add.Shawn O. Pearce2007-02-171-1/+1
* git merge documentation: -m is optionalMatthias Lederhofer2007-02-121-1/+1
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-181-1/+1
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-6/+0
* git-merge: make it usable as the first class UIJunio C Hamano2006-11-211-5/+13
* Assorted typo fixesPavel Roskin2006-07-091-1/+1
* Examples of resetting.Junio C Hamano2005-12-161-0/+5
* git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano2005-12-021-4/+6
* Documentation: Describe merge operation a bit better.Junio C Hamano2005-11-281-0/+95
View Lorry Controller Status