summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustrationPhilip Oakley2016-10-241-8/+8
* Documentation: fix misuses of "nor"Justin Lebar2014-03-311-2/+2
* howto/revert-a-faulty-merge: fix unescaped '^'srj/doc-formatting-fixRamsay Jones2013-10-141-4/+4
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-1/+1
* Documentation/howto: convert plain text files to asciidocThomas Ackermann2012-10-181-0/+4
* Typos in code comments, an error message, documentationRalf Wildenhues2010-08-221-1/+1
* Teach rebase the --no-ff option.Marc Branchaud2010-03-241-0/+90
* Documentation: Typo / spelling / formatting fixesMike Ralphson2009-03-031-2/+2
* Add a documentat on how to revert a faulty mergeNanako Shiraishi2008-12-211-0/+179