diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 41c7922..dfd1d11 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+Project Git instructiosn 6.x-1.x, 2011-04-20
+--------------------------------------------
+- Default direction updates
+ * Issue #1128070 by eliza411: Fixed Update Git instructions to include only the basic patch recommendation
+ * Issue #1127494 by eliza411: Fixed Git instructions for creating branches and tags is missing step about creating release nodes
+
Project Git instructions 6.x-1.x, 2011-03-24
--------------------------------------------
- Default direction updates
diff --git a/project_git_instructions.module b/project_git_instructions.module
index 7cd4632..49227cf 100644
--- a/project_git_instructions.module
+++ b/project_git_instructions.module
@@ -364,11 +364,12 @@ function project_git_instructions_maintainer() {
$default = <<
-Abandon changes to a specific file:
-Abandon changes to the whole working tree: Once you've pushed the properly formed tag or branch, see Creating a project release for directions to actually create the release node.
-
One-Time Only
-Setting up this repository in your local environment for the first time:
+Setting up this repository in your local environment for the first time
If you have just created a project or you already have a local repository, skip this step.
git clone --branch @branch @auth_project_url
@@ -376,7 +377,7 @@ If you have just created a project or you already have a local repository, skip
Associating your copy of the repository with your Drupal.org account
-If you have NOT already identified yourself to Git globally, do so now. Although it is standard practice to use a functional address, you can also use the pre-configured address @git_username@@uid-no-reply.drupal.org
. See Manage your Git identity for details.
+If you have NOT already identified yourself to Git globally, do so now. Although it is standard practice to use a functional address, you can also use the pre-configured address @git_username@@uid.no-reply.drupal.org
. See Identifying yourself to Git for details.
git config user.email "@email"
Committing all changes locally
-After making changes, add and commit them. Do not begin commit messages with the # symbol. See Commit messages for details.
+After making changes, add and commit them. Do not begin commit messages with the # symbol. See Commit messages for details.
git add -A
git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
@@ -404,44 +405,41 @@ After making changes, add and commit them. Do not begin commit messages with the
git push origin @branch
Creating a patch
-For a discussion of this recommend patch sequence, see the Patch contributor guide.
+Patching
+Getting ready to create or apply patches
+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, then ensure it is up-to-date with the following command:
git checkout -b [description]-[issue-number]
+git pull origin @branch
Creating a patch
+For most improvements, use the following command after making your changes:
git add -A
-git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
+git diff > [description]-[issue-number]-[comment-number].patch
Applying a patch
+Download the patch to your working directory. Apply the patch with the following command:
git status
-git fetch origin
-git rebase origin/@branch
-git diff origin/@branch > [description]-[issue-number]-[comment-number].patch
+git apply -v [patchname.patch]
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:
+To avoid accidentally including the patch file in future commits, remove it:
git checkout --track origin/@branch
-git pull origin @branch
+rm [patchname.patch]
git apply [patch.name]
rm [patch.name]
When you're done: Reverting uncommited changes
+Revert changes to a specific file:
+git checkout [filename]
+Abandoning your local changes
-
-git checkout [filename]
-git reset --hard
git reset --hard
+Creating Releases
See the naming conventions for a complete description of how to name branches and tags so you can create releases.
@@ -457,6 +455,7 @@ This creates and checks out a new branch in one command.
git tag 7.x-1.0
git push origin 7.x-1.0
-
One-Time Only
-Setting up repository for the first time:
+Setting up repository for the first time
git clone --branch @branch @anon_project_url
cd @uri
@@ -492,44 +492,41 @@ When you clone the repository you have access to all the branches and tags. The
git branch -a
git checkout [branchname]
Creating a patch
-For a discussion of this recommend patch sequence, see the Patch contributor guide.
+Patching
+Getting ready to create or apply patches
+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, then ensure it is up-to-date with the following command:
git checkout -b [description]-[issue-number]
+git pull origin @branch
Creating a patch
+For most improvements, use the following command after making your changes:
git add -A
-git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
+git diff > [description]-[issue-number]-[comment-number].patch
Applying a patch
+Download the patch to your working directory. Apply the patch with the following command:
git status
-git fetch origin
-git rebase origin/@branch
-git diff origin/@branch > [description]-[issue-number]-[comment-number].patch
+git apply -v [patchname.patch]
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:
+To avoid accidentally including the patch file in future commits, remove it:
git checkout --track origin/@branch
-git pull origin @branch
+rm [patchname.patch]
git apply [patch.name]
rm [patch.name]
git checkout [filename]
-Abandon changes to a specific file:
-
git checkout [filename]
-Abandon changes to the whole working tree:
-
git reset --hard
git reset --hard
You will be prompted to enter your Drupal.org password after the -first step (and any time you make requests from Drupal.org) if you -have not uploaded an SSH key or if your SSH key fails. See Authenticate with Git on Drupal.org for -details.
+git clone --branch @branch @auth_sandbox_url @project_fullname
cd @project_fullname
@git_username@@uid-no-reply.drupal.org
. See Identifying yourself to Git for details.
+git config user.email "@email"
git commit
and what you coul
git status
git branch -a
git checkout [branchname]
git add -A
git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
Note: When patching in response to an issue from your issue queue, the format for the commit message takes the form -of:
-git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
git diff origin/@branch
git push origin @branch
git checkout -b [description]-[issue-number]
git add -A
git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
git status
git fetch origin
git rebase origin/@branch
git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch
git diff origin/@branch > [description]-[issue-number]-[comment-number].patch
git checkout --track origin/@branch
git pull origin @branch
git apply [patch.name]
rm [patch.name]
+Abandon changes to a specific file:
+
git checkout [filename]
+Abandon changes to the whole working tree:
+
git reset --hard
git clone --branch @branch @anon_sandbox_url @project_fullname
cd @project_fullname
git branch -a
git checkout [branchname]
git pull origin @branch
git checkout -b [description]-[issue-number]
+git diff > [description]-[issue-number]-[comment-number].patch
git add -A
git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."
git apply -v [patchname.patch]
git status
git fetch origin
git rebase origin/@branch
git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch
rm [patchname.patch]
git checkout [filename]
git reset --hard