Before I push today's changes, I'll need to remove temp files (~). Evidently, my editor opened it's own instance, and saved to it instead of the regular file because I also had a vi going on the same file in the background. As such the content remains the same, but in the patch list you'll see the ~ files in there.
/sigh. Sorry all!
On 09/21/2012 09:59 AM, Michael J. McConachie wrote:
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
No prob. I think you'll want to "git reset HEAD~1" and then redo the commit.
I generally avoid using "git commit -a" , and prefer to manually "git commit file1 file2 ..."
"git status" is very helpful in that regard as it will tell you the files you probably want to commit (after using git diff to inspect the changes).
git status will also tell you if you've forgotten to git-add some files, or have files sitting around that you want to delete.
Also, in general, for the manual checks we want to provide the information in a way that is most foolproof and natural for an admin to check the system's configuration. Sometimes it's a multi-part line of bash, other times it's just going to be telling them to look in a file (in whatever manner they want).
Examples are always best, so we'll have some commits in a few hours that we think are hitting the right tone/style for checking text. And a cleanup for the awful CUPS service file...
On 09/21/2012 01:29 PM, Michael J. McConachie wrote:
Before I push today's changes, I'll need to remove temp files (~). Evidently, my editor opened it's own instance, and saved to it instead of the regular file because I also had a vi going on the same file in the background. As such the content remains the same, but in the patch list you'll see the ~ files in there.
/sigh. Sorry all!
On 09/21/2012 09:59 AM, Michael J. McConachie wrote:
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org mailto:scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
Will do.
Have to redo it for the last few -- been doing it wrong the whole time apparently.
They Check Text looks good, you can tell me what you think when you see it.
From my point of view, it does exactly what you're talking about.
(in other words I agree)
MM
On 09/21/2012 10:45 AM, Jeffrey Blank wrote:
No prob. I think you'll want to "git reset HEAD~1" and then redo the commit.
I generally avoid using "git commit -a" , and prefer to manually "git commit file1 file2 ..."
"git status" is very helpful in that regard as it will tell you the files you probably want to commit (after using git diff to inspect the changes).
git status will also tell you if you've forgotten to git-add some files, or have files sitting around that you want to delete.
Also, in general, for the manual checks we want to provide the information in a way that is most foolproof and natural for an admin to check the system's configuration. Sometimes it's a multi-part line of bash, other times it's just going to be telling them to look in a file (in whatever manner they want).
Examples are always best, so we'll have some commits in a few hours that we think are hitting the right tone/style for checking text. And a cleanup for the awful CUPS service file...
On 09/21/2012 01:29 PM, Michael J. McConachie wrote:
Before I push today's changes, I'll need to remove temp files (~). Evidently, my editor opened it's own instance, and saved to it instead of the regular file because I also had a vi going on the same file in the background. As such the content remains the same, but in the patch list you'll see the ~ files in there.
/sigh. Sorry all!
On 09/21/2012 09:59 AM, Michael J. McConachie wrote:
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org mailto:scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
Sounds good -- please go ahead and push when you've got the commit content sorted out.
On 09/21/2012 01:50 PM, Michael J. McConachie wrote:
Will do.
Have to redo it for the last few -- been doing it wrong the whole time apparently.
They Check Text looks good, you can tell me what you think when you see it.
From my point of view, it does exactly what you're talking about.
(in other words I agree)
MM
On 09/21/2012 10:45 AM, Jeffrey Blank wrote:
No prob. I think you'll want to "git reset HEAD~1" and then redo the commit.
I generally avoid using "git commit -a" , and prefer to manually "git commit file1 file2 ..."
"git status" is very helpful in that regard as it will tell you the files you probably want to commit (after using git diff to inspect the changes).
git status will also tell you if you've forgotten to git-add some files, or have files sitting around that you want to delete.
Also, in general, for the manual checks we want to provide the information in a way that is most foolproof and natural for an admin to check the system's configuration. Sometimes it's a multi-part line of bash, other times it's just going to be telling them to look in a file (in whatever manner they want).
Examples are always best, so we'll have some commits in a few hours that we think are hitting the right tone/style for checking text. And a cleanup for the awful CUPS service file...
On 09/21/2012 01:29 PM, Michael J. McConachie wrote:
Before I push today's changes, I'll need to remove temp files (~). Evidently, my editor opened it's own instance, and saved to it instead of the regular file because I also had a vi going on the same file in the background. As such the content remains the same, but in the patch list you'll see the ~ files in there.
/sigh. Sorry all!
On 09/21/2012 09:59 AM, Michael J. McConachie wrote:
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org mailto:scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
scap-security-guide@lists.fedorahosted.org
-
Jeffrey Blank -
Michael J. McConachie