summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
AgeCommit message (Expand)AuthorFilesLines
2013-04-15The name of the hash function is "SHA-1", not "SHA1"Libravatar Thomas Ackermann1-1/+1
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-2/+2
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-0/+1
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-9/+0
2010-08-20Documentation: remove backslashes in manpage synopsesLibravatar Jonathan Nieder1-1/+1
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-4/+4
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-3/+3
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Libravatar Jonathan Nieder1-2/+2
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-4/+4
2008-07-05manpages: italicize command namesLibravatar Jonathan Nieder1-1/+1
2008-07-01Documentation formatting and cleanupLibravatar Jonathan Nieder1-7/+7
2008-07-01Documentation: be consistent about "git-" versus "git "Libravatar Jonathan Nieder1-3/+3
2008-06-06documentation: move git(7) to git(1)Libravatar Christian Couder1-1/+1
2008-02-22git-merge-index documentation: clarify synopsisLibravatar Gerrit Pape1-1/+1
2008-01-06Documentation: rename gitlink macro to linkgitLibravatar Dan McGee1-1/+1
2007-10-15Fix some typos, punctuation, missing words, minor markup.Libravatar Ralf Wildenhues1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-2/+1
2007-01-18Documentation: sync git.txt command list and manual page titleLibravatar Junio C Hamano1-1/+1
2006-12-12Get rid of the dependency on RCS' merge programLibravatar Johannes Schindelin1-2/+2
2006-06-03Documentation: Spelling fixesLibravatar Horst H. von Brand1-1/+1
2006-05-05Fix up docs where "--" isn't displayed correctly.Libravatar sean1-2/+2
2005-12-08Use uniform description for the '--' option.Libravatar Nikolai Weibull1-1/+1
2005-11-11Change 'cache' to 'index' in the docsLibravatar Lukas_Sandström1-2/+2
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-07Big tool rename.Libravatar Junio C Hamano1-0/+89