Browse files

Reverting changes made for git-convenience-no-rebase

  • Loading branch information...
1 parent 5c5b348 commit b82d827854b17419553a0d0fefd2928a14521a79 @benseven benseven committed Sep 5, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 README.md
View
3 README.md
@@ -36,7 +36,7 @@ eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setu
* `gclean` - Compress & garbage collect data store
-If you've installed the wonderful [git-up](https://github.com/aanand/git-up) (which you should), it'll be used instead of `git pull`.
+If you've installed the wonderful [git-up](https://github.com/aanand/git-up) (which you should), it'll be used instead of `git pull --rebase`.
## Prompt
@@ -58,3 +58,4 @@ The prompt shows the current branch & among other helpful things:
* [git-up](https://github.com/aanand/git-up) - A brilliant tool for syncing branches
* [git completion](https://github.com/git/git/tree/master/contrib/completion) - The scripts used for the prompt & tab completion
+

0 comments on commit b82d827

Please sign in to comment.