<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 12/10/14, 3:35 PM, Shawn Wells
wrote:<br>
</div>
<blockquote cite="mid:5488AE8D.7050909@redhat.com" type="cite">
<pre wrap="">On 12/10/14, 11:40 AM, Trey Henefield wrote:
</pre>
<blockquote type="cite" style="color: #000000;">
<pre wrap=""><span class="moz-txt-citetags">></span>
<span class="moz-txt-citetags">> </span>Ah, so I do need to fork then. No I was trying to create a branch on
<span class="moz-txt-citetags">> </span>the SSG repo. That was likely my problem.
</pre>
</blockquote>
<pre wrap="">
You may find this helpful:
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/OpenSCAP/scap-security-guide/wiki/SSG-on-GitHub-Primer">https://github.com/OpenSCAP/scap-security-guide/wiki/SSG-on-GitHub-Primer</a>
Feedback is most appreciated on that process!
<div class="moz-txt-sig">-- </div></pre>
</blockquote>
<br>
So, I played around with the code some. Here's what I did to get
your code into the GitHub style:<br>
<br>
Quote notes...<br>
* I extracted your code to /tmp/trey/<br>
* My GitHub branch is /var/www/html/gh/scap-security-guide<br>
<br>
<br>
#1: Branching<br>
Within the zip file are a few new technologies, namely Firefox,
Java, and Webmin. Each one is worthy of it's own local development
branch. <br>
<br>
$ cd /var/www/html/gh/scap-security-guide/<br>
$ git branch trey-firefox<br>
$ git branch trey-java<br>
$ git branch trey-webmin<br>
<br>
To verify the branches were created:<br>
$ git branch -a<br>
* master<br>
....<br>
trey-firefox<br>
trey-java<br>
trey-webmin<br>
.....<br>
<br>
<br>
#2: "Import" the Firefox code<br>
$ git checkout trey-firefox<br>
$ git branch<br>
master<br>
shawndwells-disa-oct2014-release-diffs<br>
<b>* trey-firefox</b><br>
trey-java<br>
trey-webmin<br>
<br>
$ mv /tmp/tray/Firefox/ .<br>
$ git add Firefox/<br>
$ git commit -a -m "initial commit of firefox content"<br>
<br>
<br>
#3: "Import" the Java & Webmin code<br>
To change branches, check them out, e.g.:<br>
$ git checkout trey-java<br>
<br>
To verify what branch you're in, type "git branch". You're working
branch will have an asterisk in front.<br>
<br>
Once you're in the branch, import your content as in step #2 (mv the
code in, git add, git commit).<br>
<br>
#4: Push to GitHub<br>
We now need to push your local changes to GitHub. You'll need to do
a special formatted push for that:<br>
$ git push origin trey-firefox<br>
$ git push origin trey-java<br>
$ git push origin trey-webmin<br>
<br>
You'll see output similar to the following, though it'll only ask
you for a passphrase if you have one on your keypair:<br>
$ git push origin trey-firefox<br>
Enter passphrase for key '/home/shawnw/.ssh/id_rsa': <br>
Counting objects: 85, done.<br>
Compressing objects: 100% (81/81), done.<br>
Writing objects: 100% (84/84), 66.26 KiB, done.<br>
Total 84 (delta 41), reused 0 (delta 0)<br>
To <a class="moz-txt-link-abbreviated" href="mailto:git@github.com:shawndwells/scap-security-guide.git">git@github.com:shawndwells/scap-security-guide.git</a><br>
* [new branch] trey-firefox -> trey-firefox<br>
<br>
#5: Issue a pull request<br>
Go to your github project page, and you'll now see PR buttons like
the following:<br>
<img src="cid:part2.04030808.01060802@redhat.com" alt=""><br>
<br>
Click "Compare & pull request," fill out the form (aka change
description of what you've done), and you're done!<br>
<br>
We'll worry about how to incorporate feedback once the PRs are
submitted. This is a really fantastic contribution by the way.
Especially on Java.... very few people have tried to tackle this.<br>
</body>
</html>