Permalink
Browse files

Updated readme to point out my changes and point to Jake's original r…

…epo.
  • Loading branch information...
1 parent b6ad9fa commit 40e4bdace68bbf93f6060e570d8e7da16c8654f7 @benseven benseven committed Sep 5, 2012
Showing with 11 additions and 6 deletions.
  1. +11 −6 README.md
View
@@ -1,3 +1,7 @@
+# About this fork
+
+This is Jake Archibald's (@jaffathecake) Git Convenience, with one simple change: n00bs, and others, might not want Git Pull to use --rebase (I tried reading about it, really I did - and I almost get it - but for now, I want the lazytimes without wrapping my head around using --rebase day-to-day </excuses>).
+
# Convenient bits & bobs for Git
Git out-of-the-box isn't your best friend, git-convenience pulls together a few tools that make it that little bit more friendly. You get:
@@ -13,13 +17,13 @@ Works on OSX, Linux & Windows git-bash.
Trial it in your current terminal session:
```
-eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setup.sh) trial"
+eval "$(curl -L https://raw.github.com/benseven/git-convenience/master/setup.sh) trial"
```
If it works for you, have it in all your terminals:
```
-eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setup.sh)"
+eval "$(curl -L https://raw.github.com/benseven/git-convenience/master/setup.sh)"
```
## Shortcuts
@@ -29,8 +33,8 @@ eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setu
* `gaa` - git add --all - Add all changes (including untracto staging</dd>
* `gc "Message"` - Commit all changes (except untracked) message</dd>
* `goops` - Add changes to previous commit &amp; edit comessage</dd>
-* `gp` - Pull (via rebase) then push
-* `gup` - Pull (via rebase)
+* `gp` - Pull then push - does not use --rebase (read 'About this fork')
+* `gup` - Pull (not via --rebase - see 'About this fork')
* `glog` - Decorated &amp; graphed log
* `gdiff` - A word-diff of changes
* `gclean` - Compress &amp; garbage collect data store
@@ -40,7 +44,7 @@ If you've installed the wonderful [git-up](https://github.com/aanand/git-up) (wh
## Prompt
-![Prompt screenshot](https://raw.github.com/jakearchibald/git-convenience/master/screenshot.png)
+![Prompt screenshot](https://raw.github.com/benseven/git-convenience/master/screenshot.png)
The prompt shows the current branch & among other helpful things:
@@ -55,5 +59,6 @@ The prompt shows the current branch & among other helpful things:
## Other tools & props
+* [Jake's Original Git Convenience](https://github.com/jakearchibald/git-convenience) - The original source, with rebasey goodness.
* [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 40e4bda

Please sign in to comment.