Changes between Version 17 and Version 18 of WorkingWithGit


Ignore:
Timestamp:
Aug 20, 2016, 9:38:09 PM (8 years ago)
Author:
neverpanic (Clemens Lang)
Comment:

Fix formatting, whitespace only

Legend:

Unmodified
Added
Removed
Modified

  • WorkingWithGit

    v17 v18  
    154154
    155155'''Note:''' `git rebase` requires that you do not have uncommitted modifications in your working copy. If you have modifications, you can temporarily save them using `git stash` and restore them after the rebase using `git stash pop`.
     156
    156157'''Warning:''' `git pull` without the `--rebase` flag is a shorthand for `git fetch && git merge origin/master`, which will automatically create a merge commit if it thinks that's necessary.
    157158