summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-03-31 17:28:23 +0200
committerJim Meyering <meyering@redhat.com>2008-03-31 17:28:23 +0200
commit1a0104fc63be891a31493f6d811528ee53b624d0 (patch)
tree601985fa4f354cee660496eec18d626c633f12db
parented9120545f414cea9408e32afc2badbd1403c7b8 (diff)
downloadcoreutils-1a0104fc63be891a31493f6d811528ee53b624d0.tar.xz
* README-contribution-guidelines: Mention how to amend a commit.
Suggestion from Pádraig Brady.
-rw-r--r--README-contribution-guidelines12
1 files changed, 12 insertions, 0 deletions
diff --git a/README-contribution-guidelines b/README-contribution-guidelines
index c78ded8e7..bed256f0d 100644
--- a/README-contribution-guidelines
+++ b/README-contribution-guidelines
@@ -8,6 +8,9 @@ version 1.4.4, then you'd do well to get a newer version.
At worst, just download the latest stable release from
http://git.or.cz/ and build from source.
+For details on building the programs in this package, see
+the file, README-hacking.
+
Use the latest upstream sources
===============================
@@ -166,8 +169,17 @@ the tip of the trunk.
Now use git format-patch, as above.
+Amending the most recent change on your private branch
+======================================================
+Let's say you've just committed a change on your private
+branch, and then realize that something about it is not right.
+It's easy to adjust:
+ edit your files # this can include running "git add NEW" or "git rm BAD"
+ git commit --amend -e -a
+ git format-patch --stdout --signoff HEAD~1 > your-branch.diff
+That replaces the most recent commit with the revised one.