diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:24:38 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:24:39 +0200 |
| commit | 476e64053d3dec91623866b688a4e9eb2961248f (patch) | |
| tree | 0f6642a5cf41c48fb671fd83e0de4af92be13fc4 | |
| parent | Merge pull request #2850 (diff) | |
| parent | CONTRIBUTING.md: mention git add -p as a way to avoid spurious changes (diff) | |
| download | monero-476e64053d3dec91623866b688a4e9eb2961248f.tar.xz | |
Merge pull request #2852
631b35e7 CONTRIBUTING.md: mention git add -p as a way to avoid spurious changes (moneromooo-monero)
| -rw-r--r-- | CONTRIBUTING.md | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86eb45191..72571920a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,6 +25,17 @@ modifying is encourgaged. Proper squashing should be done (eg, if you're making a buggy patch, then a later patch to fix the bug, both patches should be merged). +If you've made random unrelated changes (either because your editor +is annoying or you made them for other reasons), you can select +what changes go into the coming commit using git add -p, which +walks you through all the changes and asks whether or not to +include this particular change. This helps create clean patches +without any irrelevant changes. git diff will show you the changes +in your tree. git diff --cached will show what is currently staged +for commit. As you add hunks with git add -p, those hunks will +"move" from the git diff output to the git diff --cached output, +so you can see clearly what your commit is going to look like. + ## Commits and Pull Requests Commit messages should be sensible. That means a subject line that |