diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2013-01-20 13:13:34 +0200 |
|---|---|---|
| committer | Tomi Ollila <tomi.ollila@iki.fi> | 2013-01-20 13:13:34 +0200 |
| commit | 882d2cdc07b55af79c5354fb2562daee22a62b81 (patch) | |
| tree | 4d8ab2fcf36f92534e333b520ee2f3bfc59094d4 | |
| parent | fc1b4c2d10ae9f39a49edaa47a09af97f7bcdbc5 (diff) | |
contributing: tabs to spaces -- we get nice 4-char indentation
| -rw-r--r-- | contributing.mdwn | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contributing.mdwn b/contributing.mdwn index cc0d909..1c8bd5b 100644 --- a/contributing.mdwn +++ b/contributing.mdwn @@ -18,7 +18,7 @@ situations; use common sense. The Notmuch source code is maintained in [git](http://git-scm.com/). Get the source code using: - git clone git://notmuchmail.org/git/notmuch + git clone git://notmuchmail.org/git/notmuch This guide assumes a working knowledge of git. There are plenty of resources available on git, such as [Pro Git](http://git-scm.com/book) and the git man @@ -30,11 +30,11 @@ The changes you submit should almost always be based on the current Notmuch git master. There are plenty of ways to work in git, and this is not your git guide, but a typical workflow might start with: - git fetch origin - git checkout -b my-local-branch origin/master - # make changes - git add ... - git commit + git fetch origin + git checkout -b my-local-branch origin/master + # make changes + git add ... + git commit If you're planning big changes, it may be advisable to __not__ polish the patch series according to all the details described below at @@ -130,14 +130,14 @@ Once you have your changes ready in your local repository, you need to send them to the Notmuch mailing list. The simplest way is to use `git send-email` to send the patches directly from your repository: - git send-email --to notmuch@notmuchmail.org origin/master + git send-email --to notmuch@notmuchmail.org origin/master An alternative is to do this in two steps; first generating patch files (using `git format-patch`), and then sending the patch files to the mailing list (using `git send-email` or a mail client): - git format-patch origin/master - git send-email --to notmuch@notmuchmail.org *.patch + git format-patch origin/master + git send-email --to notmuch@notmuchmail.org *.patch Either way, using `git send-email` to actually send the patches is recommended. It may be distributed separately from git, typically in a |