aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAge
* Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano2010-01-24
|\
| * Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder2010-01-24
| * Documentation: simplify How Merge WorksJonathan Nieder2010-01-24
| * Documentation: merge: add a section about fast-forwardJonathan Nieder2010-01-24
| * Documentation: emphasize when git merge terminates earlyJonathan Nieder2010-01-24
| * Documentation: merge: add an overviewJonathan Nieder2010-01-24
| * Documentation: merge: move merge strategy list to endJonathan Nieder2010-01-24
| * Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder2010-01-24
| * Documentation: merge: move configuration section to endJonathan Nieder2010-01-24
* | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20
|\ \ | |/
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
| * Documentation: format full commands in typewriter fontThomas Rast2010-01-10
| * Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-09
| * Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-09
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
|/
* modernize fetch/merge/pull examplesClemens Buchacher2009-10-21
* Documentation: clarify mergeoptions descriptionJonathan Nieder2009-10-09
* Documentation: git fmt-merge-msg does not have to be a scriptJonathan Nieder2009-10-09
* Documentation: merge: one <remote> is requiredPaul Bolle2009-08-12
* Grammar fix for "git merge" man pageWincent Colaiuta2009-03-26
* Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta2009-03-25
* Documentation: remove extra quoting/emphasis around literal textsChris Johnsen2009-03-17
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-09
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\
| * Fix AsciiDoc errors in merge documentationJohan Herland2008-09-04
| * git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-31
* | git-merge documentation: more details about resolving conflictsDan Hensgen2008-08-22
|/
* Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen2008-07-30
* Update my e-mail addressJunio C Hamano2008-07-21
* Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis2008-07-19
* Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-08
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-05
* Documentation formatting and cleanupJonathan Nieder2008-07-01
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-01
* documentation: move git(7) to git(1)Christian Couder2008-06-06
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-12
* Fix incorrect wording in git-merge.txt.Matthieu Moy2008-03-03
* Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas2008-01-16
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-06
* Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-22
* Merge branch 'maint' into HEADJunio C Hamano2007-10-30
|\
| * git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-30
* | Merge branch 'lh/merge'Junio C Hamano2007-10-03
|\ \ | |/ |/|
| * git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-23
* | Fix spelling of overridden in documentationShawn Bohrer2007-09-25
|/
* Try to be consistent with capitalization in the documentationSteve Hoelzer2007-08-01
* Update git-merge documentation.Jakub Narebski2007-07-12
* War on whitespaceJunio C Hamano2007-06-07
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-24
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 18:05:39 +0000