From: Oleg Broytman Date: Thu, 25 Jun 2015 18:20:42 +0000 (+0300) Subject: Reorder TODO items, reformat paragraph X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=cba020deba148456f781af26440808c2caf57909;p=git-wiki.git Reorder TODO items, reformat paragraph --- diff --git a/pep-git.txt b/pep-git.txt index 4cbedf6..7d84cba 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -394,8 +394,8 @@ i.e. ``git checkout README`` restores README to the latest commit. (Do not use ``git checkout`` to view a content of a file in a commit, use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``). -TODO: describe undo strategies: git reset, git revert, -git reflog. "Commit early, commit often". +TODO: describe undo strategies: git reset, git reflog, git revert. +"Commit early, commit often". How to undo a merge https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html