[PATCH] Rewrote various GConf checks to standardize on xmlfilecontent tests and ensured they were actually checking the correct location (gconf.xml.mandatory, not gconf.xml.defaults). (UNCLASSIFIED)

Steinke, Leland J Sr CTR DISA FSO (US) leland.j.steinke.ctr at mail.mil
Mon Jan 6 16:48:58 UTC 2014


> 
> On 1/6/14, 11:18 AM, Maura Dailey wrote:
> > I do a git pull. Does that include git fetch?
> >
> > My git-fu is weak. I skipped subversion and went straight to git from
> > CVS, so I make bad assumptions about how git works every once in a
> while.
> 
> git pull == `git fetch && git merge`

I skipped subversion as well, so I understand your situation.

I've been doing "git pull --rebase", just in case any updates sneak in before I push.


Thanks,
Leland
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5601 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/scap-security-guide/attachments/20140106/b6547904/attachment-0001.bin>


More information about the scap-security-guide mailing list