Permalink
Browse files

Advice against git pull --rebase in hotfix documentation

If you have pull.rebase=true set in your config this wouldn't do what
we expected it to.
  • Loading branch information...
1 parent 1b228bb commit 2cb5fca761d5f7ca0da32311ef243a913f956201 @avar avar committed Sep 1, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 bin/git-deploy
View
@@ -1581,7 +1581,7 @@ beforehand. Then you cherry-pick some commit/s:
Then do a:
- git pull
+ git pull --no-rebase
Followed by:

0 comments on commit 2cb5fca

Please sign in to comment.