X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=af8fc37292c30a62537df299c7cc746a9a5012a2;hb=bb5daae63fb5070f59e30b831190f6d3d8ce5958;hp=970f4a20dcb111e16d5aba399c3c2d90943ccc57;hpb=a43b1b6ac9e19c829716aef20d017238dcabc337;p=git-wiki.git diff --git a/pep-git.txt b/pep-git.txt index 970f4a2..af8fc37 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -392,9 +392,9 @@ Read `how to recover from upstream rebase It is in ``git help rebase``. On the other hand don't be too afraid about commit editing. You can -safely edit, remove, reorder, combine and split commits that hasn't +safely edit, remove, reorder, combine and split commits that haven't been pushed yet. You can even push commits to your own (backup) repo, -edit them later and force-push edited commits to replace what has +edit them later and force-push edited commits to replace what have already been pushed. Not a problem until commits are in a public or shared repository. @@ -489,10 +489,11 @@ git revert: revert a commit --------------------------- ``git revert`` reverts a commit or commits, that is, it creates a new -commit or commits that reverts the effects of the given commits. It's -the only way to undo published commits (``git commit --amend``, ``git -rebase`` and ``git reset`` change the branch in non-fast-forwardable -ways so they should only be used for non-pushed commits.) +commit or commits that revert(s) the effects of the given commits. +It's the only way to undo published commits (``git commit --amend``, +``git rebase`` and ``git reset`` change the branch in +non-fast-forwardable ways so they should only be used for non-pushed +commits.) There is a problem with reverting a merge commit. ``git revert`` can undo the code created by the merge commit but it cannot undo the fact @@ -613,7 +614,9 @@ For example:: /readme.txt eol=CRLF To check what attributes git uses for files use ``git check-attr`` -command. +command. For example:: + +$ git check-attr -a -- \*.py Advanced topics