Closed (fixed)
Project:
Project Git instructions
Version:
6.x-1.x-dev
Component:
Instructions
Priority:
Normal
Category:
Feature request
Assigned:
Unassigned
Reporter:
Created:
24 Mar 2011 at 17:11 UTC
Updated:
7 Apr 2011 at 19:51 UTC
Add directions for applying patches and abandoning local changes
Comments
Comment #1
eliza411 commentedThe following sections were added today. They were reviewed by sdboyer and webchick in IRC.
Applying a patch
If you have not already cloned the repository, follow the directions above for setting up this repository in your local environment. Be sure you are on the branch you wish to patch and that it is up-to-date using the following commands:
git checkout --track origin/[@branchname]git pull origin [@branchname]Next, download the patch to your working directory to apply it. There are many variables involved in applying patches, so if the following command doesn't work for you, see Applying patches for more detail.
git apply [patch.name]Finally, remove the patch file:
rm [patch.name]Abandoning your local changes
Abandon changes to a specific file:
git checkout [filename]Abandon changes to the whole working tree:
git reset --hard