summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* 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