Changes between Version 84 and Version 85 of WorkingWithGit
- Timestamp:
- May 22, 2019, 9:16:38 PM (5 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingWithGit
v84 v85 118 118 }}} 119 119 120 '''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`. 120 '''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`. Alternatively, if you are using git version 2.6 or newer you can use the `--autostash` option with `git pull --rebase`. With this, you would run `git pull --rebase --autostash` and this as its name suggests automatically does the `git stash` prior to the rebase, and `git stash apply` afterwards. Note that the MacPorts `git` port provides an up to date version that supports this. 121 121 122 122 '''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.