[Git][reproducible-builds/diffoscope][master] 2 commits: Add "merge request" to contributing doc

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
7902970e by Xavier Briand at 2018-06-14T17:20:38-04:00
Add "merge request" to contributing doc

- - - - -
bac105b9 by Chris Lamb at 2018-06-15T06:58:16+00:00
Merge branch 'contributing' into 'master'

Add "merge request" to contributing doc

See merge request reproducible-builds/diffoscope!5
- - - - -


1 changed file:

- CONTRIBUTING.rst


Changes:

=====================================
CONTRIBUTING.rst
=====================================
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -17,13 +17,24 @@ as follows:
 
 
 There are `more detailed instructions available
-<https://www.debian.org/Bugs/Reporting>`__ about reporting a bug in the Debian bug tracker.
+<https://www.debian.org/Bugs/Reporting>`__ about reporting a bug in the Debian
+bug tracker.
 
 If you're on a Debian-based system, you can install and use the ``reportbug``
 package to help walk you through the process.
 
+You can also submit patches via *merge request* to Salsa, Debian's Gitlab. Start
+by forking the `diffoscope Git
+repository <https://salsa.debian.org/reproducible-builds/diffoscope>`__
+(see
+`documentation <https://salsa.debian.org/help/gitlab-basics/fork-project.md>__`),
+make your changes and commit them as you normally would. You can then push your
+changes and submit a *merge request* via Salsa.  See `Gitlab documentation
+<https://salsa.debian.org/help/gitlab-basics/add-merge-request.md>`__ about
+*merge requests*.
+
 You can also submit patches to the Debian bug tracker. Start by cloning the `Git
-repository <https://salsa.debian.org/reproducible-builds/diffoscope.git/>`__,
+repository <https://salsa.debian.org/reproducible-builds/diffoscope>`__,
 make your changes and commit them as you normally would. You can then use
 Git's ``format-patch`` command to save your changes as a series of patches that
 can be attached to the report you submit. For example:



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/6eac9f6966a3a3ff5373ddeb25c42833180f38c5...bac105b9742259c22c7149a17332f6cee3e0989a

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/6eac9f6966a3a3ff5373ddeb25c42833180f38c5...bac105b9742259c22c7149a17332f6cee3e0989a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20180615/29d5f41a/attachment.html>