Title: replace erroneous mentions of 'Gitorious' with 'Kallithea'
No description
Under review
1 reviewer
git pull https://k.copyleft.org/guide-bill-auger patch-contributing-md
2016-11-05 07:36:13
bill auger (bill-auger)
mr.j.spam.me@gmail.com
Git pull requests don't support updates yet.
Pull Request Reviewers
  • Bradley Kuhn (bkuhn)
1 comment (0 inline, 1 general)
Showing 1 commit
1 2016-11-05 11:13:46
bill-auger
eeb3b354b2d3 patch-contributing-md
replace erroneous mentions of 'Gitorious' with 'Kallithea'
Common ancestor: 85bbbf1ec649
1 file changed with 6 insertions and 5 deletions:
↑ Collapse Diff ↑
CONTRIBUTING.md | master patch-contributing-md
...
 
@@ -77,13 +77,14 @@ work well with this guide.
77 77
 
Do offer merge requests and/or patches that incorporate useful third-party
78 78
 
works, provided  that is clearly licensed under CC-BY-SA.  Follow these
79 79
 
procedures when doing so:
80 80
 

	
81 81
 
0. Target all changes for the 'next' branch (see below).  Likely, use of a
82 82
 
   secondary branch will be useful for the following steps (perhaps use the
83
 
   procedure below entitled "Contributing via Gitorious" to do so).
83
 
   procedure below entitled "Contributing via copyleft.org's Kallithea
84
 
   instance" to do so).
84 85
 

	
85 86
 
1. If possible, follow this procedure for the first commit that begins the
86 87
 
   work of integrating the third party text.
87 88
 

	
88 89
 
   Initially, just "paste in" any useful text from the other work into the
89 90
 
   appropriate .tex file.  Try to keep it as similar to the upstream sourced
...
 
@@ -144,24 +145,24 @@ procedures when doing so:
144 145
 

	
145 146
 
   [Commit 07a02b0b1c6d3ac2af9ed21b2a563abcf44d3d0f](https://k.copyleft.org/guide/changeset/07a02b0b1c6d3ac2af9ed21b2a563abcf44d3d0f)
146 147
 
   is an example of the process for the last two steps.
147 148
 

	
148 149
 
5. Submit a merge request for your branch into 'next'.  In this particular
149 150
 
   situation, it's particularly helpful to make a formal merge request on
150
 
   Gitorious rather than emailing a patch set.
151
 
   Kallithea rather than emailing a patch set.
151 152
 

	
152 153
 
## Merge Request and Patch Workflow
153 154
 

	
154 155
 
Currently, the main location for work on this project is
155 156
 
[on k.copyleft.org](https://k.copyleft.org/guide), and active new
156 157
 
development on the project happens on the
157 158
 
['next' branch](https://k.copyleft.org/guide/changelog?branch=next)
158 159
 
(which is
159 160
 
[auto-published on the copyleft.org/guide-next URL](https://copyleft.org/guide-next/)).
160 161
 
Here is a suggested workflow for submitting patches — first doing so
161
 
*with* the Gitorious infrastructure, second *avoiding* the Gitorious
162
 
*with* the Kallithea infrastructure, second *avoiding* the Kallithea
162 163
 
infrastructure but still using Git, and third avoiding Git altogether.
163 164
 

	
164 165
 
Merge requests and/or patches against
165 166
 
['next' branch](https://k.copyleft.org/guide/changelog?branch=next) are
166 167
 
typically much preferred, and the workflow explanations below assume that.
167 168
 
However, merge requests and/or patches against
...
 
@@ -180,13 +181,13 @@ First-time contributors may want to do the following four items first:
180 181
 

	
181 182
 
0. [Create an account on k.copyleft.org](https://k.copyleft.org/_admin/register)
182 183
 

	
183 184
 
1. [Visit k.copyleft.org/guide](https://k.copyleft.org/guide)
184 185
 
    and choose "Fork" from the "Options" menu.
185 186
 

	
186
 
    Instead of the default, you might call your clone
187
 
    Instead of the default, you might call your fork
187 188
 
    "guide-USERNAME".
188 189
 

	
189 190
 
2. On the command line create a *local* clone of your Clone, by typing:
190 191
 

	
191 192
 
        $ git clone https://USERNAME@k.copyleft.org/guide-USERNAME copyleft-guide
192 193
 
        $ cd copyleft-guide
...
 
@@ -254,13 +255,13 @@ request.
254 255
 
   verify they've all been committed this way:
255 256
 

	
256 257
 
        $ git status
257 258
 
        # On branch my-new-idea-for-tutorial
258 259
 
        nothing to commit (working directory clean)
259 260
 

	
260
 
4. Next, upload and publish those ideas to your own clone on Gitorious.
261
 
4. Next, upload and publish those ideas to your own fork on Kallithea.
261 262
 

	
262 263
 
        $ git push guide-USERNAME my-new-idea-for-tutorial
263 264
 

	
264 265
 
    That's the end of the command-line part.
265 266
 

	
266 267
 
5. Now, visit the Kallithea pull request merge-request creation web interface at
bill auger (bill-auger)
1 year ago on pull request "replace erroneous mentions of 'Gitorious' with 'Kallithea'"

Status change: Under review

1 comment (0 inline, 1 general)