From 8df50db52919c4627ed966634750003c54d065e7 Mon Sep 17 00:00:00 2001
From: Jonathan "Duke" Leto <jonathan@leto.net>
Date: Wed, 16 Feb 2011 01:51:32 -0800
Subject: [PATCH] [doc] Add section about the amazing new merge_pull_request.pl
---
docs/project/git_workflow.pod | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/docs/project/git_workflow.pod b/docs/project/git_workflow.pod
index d327d05..7907736 100644
a
|
b
|
|
234 | 234 | |
235 | 235 | =back |
236 | 236 | |
| 237 | =head2 Merging a Github Pull Request |
| 238 | |
| 239 | If someone has sent the Parrot Github Organization a pull request, life is a |
| 240 | bit easier now. If pull request #123 has been sent, then type: |
| 241 | |
| 242 | perl tools/dev/merge_pull_request.pl 123 |
| 243 | |
| 244 | and you will automatically be on a branch called pull_request_123 with all |
| 245 | commits in the pull request applied as individually signed-off commits. Now |
| 246 | you can review the code, run tests, etc and vet the code. You can even type |
| 247 | |
| 248 | git checkout -b way_cooler_branch_name |
| 249 | |
| 250 | if you want a more informative branch name than the autogenerated one. |
| 251 | |
| 252 | If you want to merge this code to master, you then type |
| 253 | |
| 254 | git checkout master |
| 255 | git merge --no-ff pull_request_123 |
| 256 | |
| 257 | Don't forget to close the pull request manually, since signing off on the |
| 258 | commits changes their SHA1s, which means Github can't detect the merge and |
| 259 | autoclose the pull request. That's it! |
| 260 | |
| 261 | |
237 | 262 | =head2 Merging a Branch |
238 | 263 | |
239 | 264 | When you're ready to merge your changes back into master, use the C<git merge> |