RE: [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)]

> 
> 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

smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
scap-security-guide mailing list
scap-security-guide@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide