blob: f4e07f9e8de6b417b8f1eb5a07b7c6006ccbf055 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
## git-merge-pr: apply GitHub pull requests from command-line
## Usage
git merge-pr [PRNUM][@REMOTE] [GIT-AM FLAGS...]
`git merge-pr` will fetch the patch corresponding to pull request
number PRNUM of REMOTE repository (defaults to your upstream) and
applies it on top of the current tree, rewriting the commit message of
the newest patch to close the pull request upon push (can be disabled
by setting `merge-pr.autoclose` to false).
Without PRNUM, all open pull requests of REMOTE will be listed.
Useful `git am` flags:
* `--signoff`
* `--3way`
* `--interactive`
## Why rebasing pull requests is preferable to merging them
* Keeps a linear history without merge bubbles.
* Properly keeps author and committer name as well as author and commit date.
* Conflicts can easily be dealt with in an ad-hoc fashion.
* Interactive mode allows for on-the-fly cherry picking.
## Requirements
* Git 2.2.0 or newer
* wget
* jq (only for listing pull requests)
## Copyright
git-merge-pr is in the public domain.
To the extent possible under law,
Christian Neukirchen <chneukirchen@gmail.com>
has waived all copyright and related or
neighboring rights to this work.
http://creativecommons.org/publicdomain/zero/1.0/
|
