aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2013-02-19 05:05:01 -0500
committerJunio C Hamano <gitster@pobox.com>2013-02-19 12:56:30 -0800
commitae6ef554c8c785f96fce482e33cc78080aafc43f (patch)
tree24255d2a4ff8f5ccf8565e3c03082b4c44e17dd2
parent6c26bf4d4e4b1f40dcd067f8ce0c76f64eab9f47 (diff)
downloadgit-ae6ef554c8c785f96fce482e33cc78080aafc43f.tar.gz
git-ae6ef554c8c785f96fce482e33cc78080aafc43f.tar.xz
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>
-rw-r--r--Documentation/user-manual.txt14
1 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d934299fa..acf872d89 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.