Skip to content

Commit

Permalink
Reverting changes made for git-convenience-no-rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
benseven committed Sep 5, 2012
1 parent 5c5b348 commit b82d827
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setu
* `gclean` - Compress & garbage collect data store * `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 ## Prompt


Expand All @@ -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-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 * [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.