Permalink
Browse files

Adding 'gwut' command to list git-convenience commands in the terminal.

  • Loading branch information...
1 parent 77c4eda commit 5c5b3487e9c2d750b907afb1795861e048a5a7ea @benseven benseven committed Sep 5, 2012
Showing with 12 additions and 18 deletions.
  1. +6 −12 README.md
  2. +4 −4 git-shortcuts.sh
  3. +2 −2 setup.sh
View
@@ -1,9 +1,3 @@
-# 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>).
-
-I've also added the 'gwut' command, to print a list of the Git Convenience commands and symbols used at prompt - this may not work on everything as it relies on bash (I'm new...)
-
# 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:
@@ -19,13 +13,13 @@ Works on OSX, Linux & Windows git-bash.
Trial it in your current terminal session:
```
-eval "$(curl -L https://raw.github.com/benseven/git-convenience-no-rebase/master/setup.sh) trial"
+eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setup.sh) trial"
```
If it works for you, have it in all your terminals:
```
-eval "$(curl -L https://raw.github.com/benseven/git-convenience-no-rebase/master/setup.sh)"
+eval "$(curl -L https://raw.github.com/jakearchibald/git-convenience/master/setup.sh)"
```
## Shortcuts
@@ -35,8 +29,8 @@ eval "$(curl -L https://raw.github.com/benseven/git-convenience-no-rebase/master
* `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 then push - does not use --rebase (read 'About this fork')
-* `gup` - Pull (not via --rebase - see 'About this fork')
+* `gp` - Pull (via rebase) then push
+* `gup` - Pull (via rebase)
* `glog` - Decorated &amp; graphed log
* `gdiff` - A word-diff of changes
* `gclean` - Compress &amp; garbage collect data store
@@ -46,7 +40,7 @@ If you've installed the wonderful [git-up](https://github.com/aanand/git-up) (wh
## Prompt
-![Prompt screenshot](https://raw.github.com/benseven/git-convenience-no-rebase/master/screenshot.png)
+![Prompt screenshot](https://raw.github.com/jakearchibald/git-convenience/master/screenshot.png)
The prompt shows the current branch & among other helpful things:
@@ -61,6 +55,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
View
@@ -8,7 +8,7 @@ if type git-up -t > /dev/null 2>&1; then
alias gup='git-up'
alias gp='git-up && git push'
else
- alias gup='git pull'
+ alias gup='git pull --rebase'
alias gp='gup && git push'
fi
@@ -28,13 +28,13 @@ function gwut {
- - - - - - - - - - - - - -
Git Convenience Shortcuts:
- - - - - - - - - - - - - -
-gwut - List all Git Convenience commands.
+gwut - List all Git Convenience commands and prompt symbols.
gs - git status
gaa - git add --all - Add all changes (including untracto staging)
gc "Message" - Commit all changes (except untracked) message
goops - Add changes to previous commit & edit comessage
-gp - Pull then push - does not use --rebase (read 'About this fork')
-gup - Pull (not via --rebase - see 'About this fork')
+gp - Pull (via rebase) then push
+gup - Pull (via rebase)
glog - Decorated & graphed log
gdiff - A word-diff of changes
gclean - Compress & garbage collect data store
View
@@ -32,8 +32,8 @@ function setup_git_convenience {
git_load_helper https://raw.github.com/git/git/e90020cdb3273af3b0c7915c0aacf16b19bbf994/contrib/completion/git-prompt.sh "$HOME/.git-prompt.sh" "$bash_startup_file" "$1"
fi
- git_load_helper https://raw.github.com/benseven/git-convenience-no-rebase/master/terminal-prefs.sh "$HOME/.terminal-prefs.sh" "$bash_startup_file" "$1"
- git_load_helper https://raw.github.com/benseven/git-convenience-no-rebase/master/git-shortcuts.sh "$HOME/.git-shortcuts.sh" "$bash_startup_file" "$1"
+ git_load_helper https://raw.github.com/jakearchibald/git-convenience/master/terminal-prefs.sh "$HOME/.terminal-prefs.sh" "$bash_startup_file" "$1"
+ git_load_helper https://raw.github.com/jakearchibald/git-convenience/master/git-shortcuts.sh "$HOME/.git-shortcuts.sh" "$bash_startup_file" "$1"
unset setup_git_convenience
unset git_load_helper

0 comments on commit 5c5b348

Please sign in to comment.