diff options
| author | W. Trevor King <wking@tremily.us> | 2013-02-19 10:05:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-19 20:56:30 (GMT) |
| commit | ae6ef554c8c785f96fce482e33cc78080aafc43f (patch) | |
| tree | 24255d2a4ff8f5ccf8565e3c03082b4c44e17dd2 /Documentation/user-manual.txt | |
| parent | 6c26bf4d4e4b1f40dcd067f8ce0c76f64eab9f47 (diff) | |
| download | git-ae6ef554c8c785f96fce482e33cc78080aafc43f.zip git-ae6ef554c8c785f96fce482e33cc78080aafc43f.tar.gz git-ae6ef554c8c785f96fce482e33cc78080aafc43f.tar.bz2 | |
user-manual: Use request-pull to generate "please pull" text
Less work and more error checking (e.g. does a merge base exist?).
Add an explicit push before request-pull to satisfy request-pull,
which checks to make sure the references are publically available.
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d934299..acf872d 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2305,17 +2305,13 @@ branch and then merge into each of the test and release branches. For these changes, just apply directly to the "release" branch, and then merge that into the "test" branch. -To create diffstat and shortlog summaries of changes to include in a "please -pull" request to Linus you can use: +After pushing your work to `mytree`, you can use +linkgit:git-request-pull[1] to prepare a "please pull" request message +to send to Linus: ------------------------------------------------- -$ git diff --stat origin..release -------------------------------------------------- - -and - -------------------------------------------------- -$ git log -p origin..release | git shortlog +$ git push mytree +$ git request-pull origin mytree release ------------------------------------------------- Here are some of the scripts that simplify all this even further. |