git-whistles 0.5.0 → 0.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +9 -25
- data/lib/git-whistles/version.rb +1 -1
- metadata +3 -3
data/README.md
CHANGED
@@ -8,20 +8,18 @@ Install with:
|
|
8
8
|
*Note*: if you installed a previous version of this by cloning the repository, you'll have to remove that clone from your `PATH`.
|
9
9
|
Otherwise strange load issues may happen.
|
10
10
|
|
11
|
-
|
11
|
+
Use it with:
|
12
12
|
|
13
|
-
`git
|
13
|
+
- `git ff-all-branches [-f] [-p] [-v]`. Fast-forward all local tracking branches to their remote counterpart (where possible). Very useful on big projects.
|
14
|
+
- `git stash-and-checkout [branch]` As the name implies: stash and checkout another branch.
|
15
|
+
- `git-pull-request [your-branch] [target-branch]` Open your browser at a Github pull-request page for the specified branch (defaults to the current `head`). If you're using Pivotal Tracker and your branch has a story number in its name, populates your pull request with story details.
|
16
|
+
- `git outstanding-features [from-branch] [to-branch]` List the pull requests merged in `[to-branch]` but not in `[from-branch]`. Useful to prepare a list of stuff you're oging to deploy. Defaults to listing what's on `origin/master` but not on `origin/production`.
|
17
|
+
- `git chop [branch]` Delete the local and origin copy of a branch. Useful to close feature branches once a feature is completed.
|
18
|
+
- `git list-branches [-l] [-r] [-i integration-branch]` Colourful listing of all local or origin branches, and their distance to an integration branch (`master` by default).
|
19
|
+
- `git merge-po <ancestor> <left> <right>` Merge engine for GetText PO files.
|
14
20
|
|
15
|
-
|
16
|
-
Useful to close feature branches once a feature is completed.
|
21
|
+
### More details on some of the commands
|
17
22
|
|
18
|
-
#### list-branches
|
19
|
-
|
20
|
-
|
21
|
-
`git list-branches [-l] [-r] [-i integration-branch]`
|
22
|
-
|
23
|
-
Colourful listing of all local or origin branches, and their distance to an
|
24
|
-
integration branch (`master` by default).
|
25
23
|
|
26
24
|
#### merge-po
|
27
25
|
|
@@ -45,14 +43,6 @@ Add this to .gitattributes:
|
|
45
43
|
*.pot merge=pofile
|
46
44
|
|
47
45
|
|
48
|
-
#### pull-request
|
49
|
-
|
50
|
-
`git-pull-request [branch]`
|
51
|
-
|
52
|
-
Open your browser at a Github pull-request page for the specified branch
|
53
|
-
(defaults to the current `head`).
|
54
|
-
|
55
|
-
|
56
46
|
#### stash-and-checkout
|
57
47
|
|
58
48
|
`git stash-and-checkout [branch]`
|
@@ -65,9 +55,3 @@ This lets you keep work in progress on multiple branches without committing it.
|
|
65
55
|
|
66
56
|
I tend to alias this to `git co`.
|
67
57
|
|
68
|
-
|
69
|
-
#### outstanding-features
|
70
|
-
|
71
|
-
`git checkout production ; git outstanding-features`
|
72
|
-
|
73
|
-
Lists the merge pull-requests that are on `production` but not (yet) on `origin/production`.
|
data/lib/git-whistles/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git-whistles
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-10-
|
12
|
+
date: 2012-10-17 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
156
156
|
version: '0'
|
157
157
|
segments:
|
158
158
|
- 0
|
159
|
-
hash:
|
159
|
+
hash: 1223314009549717192
|
160
160
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
161
161
|
none: false
|
162
162
|
requirements:
|