<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body>If this is a fresh clone, and you're the only one pushing, it ought be be unnecessary to pull. It can't hurt though. If you have your local changes committed there's little you can do to cause permanent damage, so long as you don't mess with the .git folder. <div><br></div><div>I'm somewhat of a reluctant git ninja. Even though Ican do a lot with the command line, a decent gui can do git acrobatics 10x faster that fumbling around witha console display and git's arcane command line options. I use tortoise git on Windows. Some like Atlassian SourceTree, though I'm not a huge fan of it. On Linux Mint Cinnamon(my go-to distro), there is a nemo plugin that works similar to Tortoise.</div><div><br></div><div>Sorry I'm going to miss the meet tonight, but if anyone ever feels like getting together for some coffee/beer and git, I'd be down for it.</div><div><br></div><div>-Jon</div><div><br></div><div><br></div><div><br></div><br><br>-------- Original message --------<br>From: Scott Hall via TriEmbed <triembed@triembed.org> <br>Date: 9/12/16 6:23 PM (GMT-05:00) <br>To: Pete Soper <pete@soper.us> <br>Cc: Triangle Embedded Computing Discussion <TriEmbed@triembed.org> <br>Subject: Re: [TriEmbed] hail mary github question <br><br><div dir="ltr"><div>Also, don't forget "git pull". Your local clone may not be in sync. Also make sure that you do a "git rm" from the expected branch. Note that if you remove an element from one branch that was added in a different branch, of course the tracking remote will still show it -- at least for the other branches that it was visible.<br><br></div>Note that you can use git-rebase to change the order of git commits and essentially change the history. I've used this to merge separated commits into a single commit. <br>This way you can reorder where you did the git-add commit of those two files, and reorder that commit next to a remove of those two elements, and merge the two commits like they never existed in the first place. Here is some info:<br><br><h3 class="gmail-r"><a target="_blank" href="https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=2&cad=rja&uact=8&ved=0ahUKEwidvsKW7YrPAhVDOj4KHVyxCAAQFggmMAE&url=http%3A%2F%2Fblog.dennisrobinson.name%2Freorder-commits-with-git%2F&usg=AFQjCNE2UrpbdmEksQ2SCoHYBLArnviyzw&sig2=YaPmZvo7cPAc1bDuWWg6Ng">How to reorder commits with Git | Dennis Robinson</a></h3><p><br></p><h3 class="gmail-r"><a href="https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History" target="_blank">Git - Rewriting History</a></h3><p><br></p><h3 class="gmail-r"><a target="_blank" href="http://gitready.com/advanced/2009/03/20/reorder-commits-with-rebase.html">git ready ยป reorder commits with rebase</a></h3><p><br></p><h3 class="gmail-r"><a href="http://stackoverflow.com/questions/2740537/reordering-of-commits" target="_blank">git - Reordering of commits - Stack Overflow</a></h3><p><br></p><h3 class="gmail-r"><a target="_blank" href="https://jwiegley.github.io/git-from-the-bottom-up/1-Repository/8-interactive-rebasing.html">Interactive rebasing | Git from the Bottom Up - GitHub Pages</a></h3><p><br></p><p>Note that you can "get" yourself down a rabbit hole with this if you are not careful (pun intended).</p><p><br></p><p>- sgh<br></p></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Sep 12, 2016 at 5:44 PM, Jon Wolfe via TriEmbed <span dir="ltr"><<a href="mailto:triembed@triembed.org" target="_blank">triembed@triembed.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>git status<div><br></div><div>And </div><div><br></div><div>git log --decorate</div><div><br></div><div>Are your friends. They should show you what you local and remote tracking branches are. You can also run :</div><div><br></div><div>gitk&</div><div><br></div><div>To get a primitive gui git log.</div><div><br></div><div><br></div><div> A script that auto commits sounds... dangerous, unless you are talking about a tool that expects complete authority over your working copy, like SparkleShare</div><div><div class="h5"><div><br></div><div><br></div><br><br>-------- Original message --------<br>From: Pete Soper via TriEmbed <<a href="mailto:triembed@triembed.org" target="_blank">triembed@triembed.org</a>> <br>Date: 9/12/16 5:32 PM (GMT-05:00) <br>To: Carl Nobile <<a href="mailto:carl.nobile@gmail.com" target="_blank">carl.nobile@gmail.com</a>> <br>Cc: Triangle Embedded Computing Discussion <<a href="mailto:TriEmbed@triembed.org" target="_blank">TriEmbed@triembed.org</a>> <br>Subject: Re: [TriEmbed] hail mary github question <br><br>
<p>Yes, you're missing it. <br>
</p>
<p>I just cloned the tree from Github into an empty directory, went
into the repo, did a "git rm " of the two mystery files, git said
they were deleted, but when I did a "git push" and put in
id/password I was told everything is up to date and the two files
are still sitting in the repo on Github. They're beyond my
control. But I was going to restructure anyway. They are what they
are, and I'm going to stop caring.<br>
</p>
<p>Thanks,</p>
<p>Pete</p>
<p><br>
</p>
<br>
<div>On 09/12/2016 05:27 PM, Carl Nobile
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">Pete,
<div><br>
</div>
<div>Anything you do in a git repo will not and cannot remove
the repo itself.</div>
<div><br>
</div>
<div>Or am I miss understanding the problem?</div>
<div><br>
</div>
<div>I went to the repo you mentioned and there was nothing in
it.</div>
<div><br>
</div>
<div>Carl</div>
<div><br>
</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Mon, Sep 12, 2016 at 5:22 PM, Robert
Dale via TriEmbed <span dir="ltr"><<a href="mailto:triembed@triembed.org" target="_blank">triembed@triembed.org</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Git
commit. And are you pushing / looking at the right branch?
<div>
<div><br>
<br>
On Monday, September 12, 2016, Pete Soper via TriEmbed
<<a href="mailto:triembed@triembed.org" target="_blank">triembed@triembed.org</a>>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I do
a "git rm foo" and a "git push", all goes well, but at
<a href="http://github.com/myrepo" target="_blank">http://github.com/myrepo</a>
"foo" is still there. Is there a "git
--nuclear-tipped-cruise-missil<wbr>e rm foo"?<br>
<br>
-Pete<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
Triangle, NC Embedded Computing mailing list<br>
<a>TriEmbed@triembed.org</a><br>
<a href="http://mail.triembed.org/mailman/listinfo/triembed_triembed.org" target="_blank">http://mail.triembed.org/mailm<wbr>an/listinfo/triembed_triembed.<wbr>org</a><br>
TriEmbed web site: <a href="http://TriEmbed.org" target="_blank">http://TriEmbed.org</a><br>
</blockquote>
<br>
<br>
</div>
</div>
<span><font color="#888888">-- <br>
null<br>
</font></span><br>
______________________________<wbr>_________________<br>
Triangle, NC Embedded Computing mailing list<br>
<a href="mailto:TriEmbed@triembed.org" target="_blank">TriEmbed@triembed.org</a><br>
<a href="http://mail.triembed.org/mailman/listinfo/triembed_triembed.org" rel="noreferrer" target="_blank">http://mail.triembed.org/mailm<wbr>an/listinfo/triembed_triembed.<wbr>org</a><br>
TriEmbed web site: <a href="http://TriEmbed.org" rel="noreferrer" target="_blank">http://TriEmbed.org</a><br>
<br>
</blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
<div data-smartmail="gmail_signature">------------------------------<wbr>------------------------------<wbr>-------------------<br>
Carl J. Nobile (Software Engineer)<br>
<a href="mailto:carl.nobile@gmail.com" target="_blank">carl.nobile@gmail.com</a><br>
------------------------------<wbr>------------------------------<wbr>-------------------</div>
</div>
</blockquote>
<br>
</div></div></div><br>______________________________<wbr>_________________<br>
Triangle, NC Embedded Computing mailing list<br>
<a href="mailto:TriEmbed@triembed.org">TriEmbed@triembed.org</a><br>
<a href="http://mail.triembed.org/mailman/listinfo/triembed_triembed.org" rel="noreferrer" target="_blank">http://mail.triembed.org/<wbr>mailman/listinfo/triembed_<wbr>triembed.org</a><br>
TriEmbed web site: <a href="http://TriEmbed.org" rel="noreferrer" target="_blank">http://TriEmbed.org</a><br>
<br></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Scott G. Hall<br>Raleigh, NC, USA<br><a href="mailto:scottghall1@gmail.com" target="_blank">scottghall1@gmail.com</a></div>
</div>
</body></html>