git_pretty_accept 0.3.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.markdown +6 -0
- data/MIT-LICENSE +21 -0
- data/README.md +22 -1
- data/git_pretty_accept.gemspec +3 -3
- data/lib/git_pretty_accept/version.rb +1 -1
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 12f24d9aa0af834a4394838c7075e19e55c7573e
|
4
|
+
data.tar.gz: 2ec2c68340f2e2b906d1225d805cbc08e34d17d9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0c77d78b5c061b26f954bfbfe6708ae83925a21186deafa8cb957e440d84295a70a2c6e4ed937526f3b66bed74b2f3f3b3367953aadb3b17cb547b48537a2e14
|
7
|
+
data.tar.gz: c544dcc0f68d9ba1efed28a9841407c9d60b0acff1028f578b2410ccddb50d944d03ce5225d7b13e10581a24dc1ac78e7220b404c1fe086bfc0aa7cda535a7bb
|
data/CHANGELOG.markdown
CHANGED
data/MIT-LICENSE
ADDED
@@ -0,0 +1,21 @@
|
|
1
|
+
Copyright (c) 2014 Love With Food, George Mendoza
|
2
|
+
https://www.lovewithfood.com
|
3
|
+
|
4
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
5
|
+
a copy of this software and associated documentation files (the
|
6
|
+
"Software"), to deal in the Software without restriction, including
|
7
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
8
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
9
|
+
permit persons to whom the Software is furnished to do so, subject to
|
10
|
+
the following conditions:
|
11
|
+
|
12
|
+
The above copyright notice and this permission notice shall be
|
13
|
+
included in all copies or substantial portions of the Software.
|
14
|
+
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
16
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
17
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
18
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
19
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
20
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
21
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
CHANGED
@@ -29,7 +29,28 @@ Or install it yourself as:
|
|
29
29
|
|
30
30
|
## Usage
|
31
31
|
|
32
|
-
|
32
|
+
To accept a pull request, just run `git pretty-accept BRANCH_NAME` in
|
33
|
+
the branch where `BRANCH_NAME` will be merged.
|
34
|
+
|
35
|
+
## Merge commit template
|
36
|
+
|
37
|
+
You can also provide a merge commit template
|
38
|
+
`.git-pretty-accept-template.txt` to your project directory. This is
|
39
|
+
great if you want your merge commits to follow a certain format e.g.
|
40
|
+
you want your team to enter the issue link when accepting pull requests.
|
41
|
+
|
42
|
+
## Caveats
|
43
|
+
|
44
|
+
We wrote git_pretty_accept for our particular workflow. If you'd like
|
45
|
+
to use the gem, here are a few things you'll need to keep in mind. The
|
46
|
+
script
|
47
|
+
|
48
|
+
1. Assumes that your remote repository is origin. It doesn't work yet with
|
49
|
+
Github forks.
|
50
|
+
1. Automatically removes the local and remote branch of the pull request
|
51
|
+
once the pull request is merged.
|
52
|
+
1. Complains if you accidentally try to accept the master branch to a feature
|
53
|
+
branch.
|
33
54
|
|
34
55
|
## Contributing
|
35
56
|
|
data/git_pretty_accept.gemspec
CHANGED
@@ -6,8 +6,8 @@ require 'git_pretty_accept/version'
|
|
6
6
|
Gem::Specification.new do |spec|
|
7
7
|
spec.name = "git_pretty_accept"
|
8
8
|
spec.version = GitPrettyAccept::VERSION
|
9
|
-
spec.authors = ["George Mendoza"]
|
10
|
-
spec.email = ["
|
9
|
+
spec.authors = ["Love With Food, George Mendoza"]
|
10
|
+
spec.email = ["george@lovewithfood.com"]
|
11
11
|
spec.description = %q{
|
12
12
|
`git-pretty-accept` is a script that rebases a pull request before
|
13
13
|
merging to master. Pull requests are _always_ merged recursively. The
|
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
|
|
16
16
|
}.gsub(/\s+/, ' ')
|
17
17
|
|
18
18
|
spec.summary = %q{Accept pull requests, the pretty way}
|
19
|
-
spec.homepage = "https://github.com/
|
19
|
+
spec.homepage = "https://github.com/lovewithfood/git_pretty_accept"
|
20
20
|
spec.license = "MIT"
|
21
21
|
|
22
22
|
spec.files = `git ls-files`.split($/)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git_pretty_accept
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
-
- George Mendoza
|
7
|
+
- Love With Food, George Mendoza
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2014-01-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: git
|
@@ -154,7 +154,7 @@ description: ' `git-pretty-accept` is a script that rebases a pull request befor
|
|
154
154
|
merging to master. Pull requests are _always_ merged recursively. The result is
|
155
155
|
a linear history with merge bubbles indicating pull requests. In short, pretty. '
|
156
156
|
email:
|
157
|
-
-
|
157
|
+
- george@lovewithfood.com
|
158
158
|
executables:
|
159
159
|
- git-pretty-accept
|
160
160
|
extensions: []
|
@@ -165,6 +165,7 @@ files:
|
|
165
165
|
- Gemfile
|
166
166
|
- Guardfile
|
167
167
|
- LICENSE.txt
|
168
|
+
- MIT-LICENSE
|
168
169
|
- README.md
|
169
170
|
- Rakefile
|
170
171
|
- bin/git-pretty-accept
|
@@ -178,7 +179,7 @@ files:
|
|
178
179
|
- spec/spec_helper.rb
|
179
180
|
- spec/support/local_repo.rb
|
180
181
|
- spec/support/remote_repo.rb
|
181
|
-
homepage: https://github.com/
|
182
|
+
homepage: https://github.com/lovewithfood/git_pretty_accept
|
182
183
|
licenses:
|
183
184
|
- MIT
|
184
185
|
metadata: {}
|