summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
Commit message (Expand)AuthorAgeFilesLines
* The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-151-1/+1
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-2/+2
* Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
* doc: drop author/documentation sections from most pagesJeff King2011-03-111-9/+0
* Documentation: remove backslashes in manpage synopsesJonathan Nieder2010-08-201-1/+1
* Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-4/+4
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-3/+3
* manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder2008-07-051-2/+2
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-4/+4
* manpages: italicize command namesJonathan Nieder2008-07-051-1/+1
* Documentation formatting and cleanupJonathan Nieder2008-07-011-7/+7
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-3/+3
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* git-merge-index documentation: clarify synopsisGerrit Pape2008-02-221-1/+1
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-1/+1
* Fix some typos, punctuation, missing words, minor markup.Ralf Wildenhues2007-10-151-1/+1
* War on whitespaceJunio C Hamano2007-06-071-2/+1
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-181-1/+1
* Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-2/+2
* Documentation: Spelling fixesHorst H. von Brand2006-06-031-1/+1
* Fix up docs where "--" isn't displayed correctly.sean2006-05-051-2/+2
* Use uniform description for the '--' option.Nikolai Weibull2005-12-081-1/+1
* Change 'cache' to 'index' in the docsLukas_Sandström2005-11-111-2/+2
* Remove the version tags from the manpagesJunio C Hamano2005-10-101-1/+0
* [PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov2005-09-201-1/+1
* Big tool rename.Junio C Hamano2005-09-071-0/+89