OLD | NEW |
1 # Git Cookbook | 1 # Git Cookbook |
2 | 2 |
3 A collection of git recipes to do common git tasks. | 3 A collection of git recipes to do common git tasks. |
4 | 4 |
5 See also [Git Tips](git_tips.md). | 5 See also [Git Tips](git_tips.md). |
6 | 6 |
7 [TOC] | 7 [TOC] |
8 | 8 |
9 ## Introduction | 9 ## Introduction |
10 | 10 |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 ``` | 234 ``` |
235 commit 016d28b8c4959a3d28d2fbfb4b86c0361aad74ef | 235 commit 016d28b8c4959a3d28d2fbfb4b86c0361aad74ef |
236 Author: mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951
-d872f2087c98> | 236 Author: mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951
-d872f2087c98> |
237 Date: Mon Jul 19 19:09:41 2010 +0000 | 237 Date: Mon Jul 19 19:09:41 2010 +0000 |
238 | 238 |
239 Revert r42636. That hack is no longer needed now that we removed the compact | 239 Revert r42636. That hack is no longer needed now that we removed the compact |
240 location bar view. | 240 location bar view. |
241 | 241 |
242 BUG=38992 | 242 BUG=38992 |
243 | 243 |
244 Review URL: http://codereview.chromium.org/3036004 | 244 Review URL: https://codereview.chromium.org/3036004 |
245 | 245 |
246 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52935 0039d316-1c4b-4281
-b951-d872f2087c98 | 246 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52935 0039d316-1c4b-4281
-b951-d872f2087c98 |
247 ``` | 247 ``` |
248 | 248 |
249 Will be parsed to map svn revision r52935 (on Google Code) to commit | 249 Will be parsed to map svn revision r52935 (on Google Code) to commit |
250 016d28b8c4959a3d28d2fbfb4b86c0361aad74ef. The parsing will generate a lot of | 250 016d28b8c4959a3d28d2fbfb4b86c0361aad74ef. The parsing will generate a lot of |
251 lines that look like `rXXXX = 01234ABCD`. It should generally take a minute or | 251 lines that look like `rXXXX = 01234ABCD`. It should generally take a minute or |
252 so when doing an incremental update. | 252 so when doing an incremental update. |
253 | 253 |
254 For this to work, two things must be true: | 254 For this to work, two things must be true: |
255 | 255 |
256 * The svn url in the `svn-remote` clause must exactly match the url in the | 256 * The svn url in the `svn-remote` clause must exactly match the url in the |
257 git-svn-id pulled form the server. | 257 git-svn-id pulled form the server. |
258 * The fetch from origin must write into the exact same branch that specified | 258 * The fetch from origin must write into the exact same branch that specified |
259 in the fetch line of `svn-remote`. | 259 in the fetch line of `svn-remote`. |
260 | 260 |
261 If either of these are not true, then `git svn fetch` and friends will talk to | 261 If either of these are not true, then `git svn fetch` and friends will talk to |
262 svn directly, and be very slow. | 262 svn directly, and be very slow. |
263 | 263 |
264 ## Reusing a Git mirror | 264 ## Reusing a Git mirror |
265 | 265 |
266 If you have a nearby copy of a Git repo, you can quickly bootstrap your copy | 266 If you have a nearby copy of a Git repo, you can quickly bootstrap your copy |
267 from that one then adjust it to point it at the real upstream one. | 267 from that one then adjust it to point it at the real upstream one. |
268 | 268 |
269 1. Clone a nearby copy of the code you want: `git clone coworker-machine:/path/
to/repo` | 269 1. Clone a nearby copy of the code you want: `git clone coworker-machine:/path/
to/repo` |
270 1. Change the URL your copy fetches from to point at the real git repo: | 270 1. Change the URL your copy fetches from to point at the real git repo: |
271 `git set-url origin http://src.chromium.org/git/chromium.git` | 271 `git set-url origin https://src.chromium.org/git/chromium.git` |
272 1. Update your copy: `git fetch` | 272 1. Update your copy: `git fetch` |
273 1. Delete any extra branches that you picked up in the initial clone: | 273 1. Delete any extra branches that you picked up in the initial clone: |
274 `git prune origin` | 274 `git prune origin` |
OLD | NEW |