[TriEmbed] hail mary github question

[Scott Hall]

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.

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

How to reorder commits with Git | Dennis Robinson
<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>


Git - Rewriting History
<https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History>


git ready » reorder commits with rebase
<http://gitready.com/advanced/2009/03/20/reorder-commits-with-rebase.html>


git - Reordering of commits - Stack Overflow
<http://stackoverflow.com/questions/2740537/reordering-of-commits>


Interactive rebasing | Git from the Bottom Up - GitHub Pages
<https://jwiegley.github.io/git-from-the-bottom-up/1-Repository/8-interactive-rebasing.html>


Note that you can "get" yourself down a rabbit hole with this if you are
not careful (pun intended).


- sgh

On Mon, Sep 12, 2016 at 5:44 PM, Jon Wolfe via TriEmbed <
triembed at triembed.org> wrote:

> git status
>
> And
>
> git log --decorate
>
> Are your friends. They should show you what you local and remote tracking
> branches are. You can also run :
>
> gitk&
>
> To get a primitive gui git log.
>
>
>  A script that auto commits sounds... dangerous, unless you are talking
> about a tool that expects complete authority over your working copy, like
> SparkleShare
>
>
>
>
> -------- Original message --------
> From: Pete Soper via TriEmbed <triembed at triembed.org>
> Date: 9/12/16 5:32 PM (GMT-05:00)
> To: Carl Nobile <carl.nobile at gmail.com>
> Cc: Triangle Embedded Computing Discussion <TriEmbed at triembed.org>
> Subject: Re: [TriEmbed] hail mary github question
>
> Yes, you're missing it.
>
> 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.
>
> Thanks,
>
> Pete
>
>
>
> On 09/12/2016 05:27 PM, Carl Nobile wrote:
>
> Pete,
>
> Anything you do in a git repo will not and cannot remove the repo itself.
>
> Or am I miss understanding the problem?
>
> I went to the repo you mentioned and there was nothing in it.
>
> Carl
>
>
> On Mon, Sep 12, 2016 at 5:22 PM, Robert Dale via TriEmbed <
> triembed at triembed.org> wrote:
>
>> Git commit.  And are you pushing / looking at the right branch?
>>
>>
>> On Monday, September 12, 2016, Pete Soper via TriEmbed <
>> triembed at triembed.org> wrote:
>>
>>> I do a "git rm foo" and a "git push", all goes well, but at
>>> http://github.com/myrepo "foo" is still there. Is there a "git
>>> --nuclear-tipped-cruise-missile rm foo"?
>>>
>>> -Pete
>>>
>>>
>>>
>>> _______________________________________________
>>> Triangle, NC Embedded Computing mailing list
>>> TriEmbed at triembed.org
>>> http://mail.triembed.org/mailman/listinfo/triembed_triembed.org
>>> TriEmbed web site: http://TriEmbed.org
>>>
>>
>>
>> --
>> null
>>
>> _______________________________________________
>> Triangle, NC Embedded Computing mailing list
>> TriEmbed at triembed.org
>> http://mail.triembed.org/mailman/listinfo/triembed_triembed.org
>> TriEmbed web site: http://TriEmbed.org
>>
>>
>
>
> --
> ------------------------------------------------------------
> -------------------
> Carl J. Nobile (Software Engineer)
> carl.nobile at gmail.com
> ------------------------------------------------------------
> -------------------
>
>
>
> _______________________________________________
> Triangle, NC Embedded Computing mailing list
> TriEmbed at triembed.org
> http://mail.triembed.org/mailman/listinfo/triembed_triembed.org
> TriEmbed web site: http://TriEmbed.org
>
>


-- 
Scott G. Hall
Raleigh, NC, USA
scottghall1 at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.triembed.org/pipermail/triembed_triembed.org/attachments/20160912/6413bd53/attachment.htm>