[OCLUG-Tech] Git and all that

2017-10-02 Thread Rob Echlin
HiOn Thursday, I will present some information about git services.I would like that to be a kickoff for a discussion of people's experience with GitHub, GitLab, GitBucket. If you have some areas you would like to mention, you can post here or email me and i can add slides wtih topics and people'

[OCLUG-Tech] "git filter-branch" to undo the effect of a single commit that added stuff?

2017-09-09 Thread Robert P. J. Day
curious about the proper way to remove the effect of a single commit from git history whose purpose was to add some content, but there's more to it than that. say, once upon a time, i added a sizable top-level directory (call it /subdir) to a repo and committed that, then later learned i didn

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Alex Pilon
On Mon, May 16, 2016 at 06:57:51AM -0400, Robert P. J. Day wrote: > i'm assuming that i can use a combination of cherry picking and > rebasing to "extract" any linear sequence of commits from a branch if > i decide they properly belonged elsewhere. > > is it just me, or do other people think this i

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Richard Guy Briggs
On 16/05/16, Robert P. J. Day wrote: > > i hope rob doesn't mind my replying to his personal note from a > while back and CC'ing the list, since there's a bit more here than > meets the eye, and i wanted to make sure i was presenting it fairly. > > the problem was, having added, say, 5 linear

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Robert P. J. Day
i hope rob doesn't mind my replying to his personal note from a while back and CC'ing the list, since there's a bit more here than meets the eye, and i wanted to make sure i was presenting it fairly. the problem was, having added, say, 5 linear commits to a branch (A, B, C, D, E): ... X <--

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Robert P. J. Day
On Tue, 10 May 2016, Richard Guy Briggs wrote: > On 16/05/10, Robert P. J. Day wrote: > > SCENARIO: most recent 5 commits on a clean, linear history branch: > > > > ... X <--- A <--- B <--- C <--- D <--- E (HEAD) > > > > suddenly, i wish i hadn't done A, but want to leave the more > > recent

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Alex Pilon
On Tue, May 10, 2016 at 06:14:21AM -0400, Robert P. J. Day wrote: > i can remove the first line and save to get: > > ... X <--- B' <--- C' <--- D' <--- E' (HEAD) > > is there a way to do that without having to fire up an interactive > rebase session? Provided you never have rebase/merge/cherry

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Richard Guy Briggs
On 16/05/10, Robert P. J. Day wrote: > SCENARIO: most recent 5 commits on a clean, linear history branch: > > ... X <--- A <--- B <--- C <--- D <--- E (HEAD) > > suddenly, i wish i hadn't done A, but want to leave the more recent > commits on that branch (rebased of course). > > pretty s

[OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Robert P. J. Day
ASIDE: i know of several ways to do this, i'm just wondering if there's a particularly elegant way i haven't thought of. SCENARIO: most recent 5 commits on a clean, linear history branch: ... X <--- A <--- B <--- C <--- D <--- E (HEAD) suddenly, i wish i hadn't done A, but want to leave

Re: [OCLUG-Tech] "git fetch" versus "git fetch --tags"?

2015-07-01 Thread Rob Echlin
If I remember correctly, "git push" has similar stuff.You need to run "git push", then "git push --tags" to push your tags.I don't think you will get the delta pushed with the --tags version.So I think it may be similar with fetch. All my very best,Rob  -- Rob Echlin, B. Eng. 613-266-8311 -  Ott

Re: [OCLUG-Tech] "git fetch" versus "git fetch --tags"?

2015-06-28 Thread Robert P. J. Day
On Sun, 28 Jun 2015, Aidan Van Dyk wrote: > A normal "git fetch" will fetch tags that point to commits being > fetched. So if you are fetching new histroy that has a tag pointing > to it, that tag will be fetched with it. But by default, fetch only > pulls "refs/heads/*" (branch namespace). Add

Re: [OCLUG-Tech] "git fetch" versus "git fetch --tags"?

2015-06-28 Thread Aidan Van Dyk
A normal "git fetch" will fetch tags that point to commits being fetched. So if you are fetching new histroy that has a tag pointing to it, that tag will be fetched with it. But by default, fetch only pulls "refs/heads/*" (branch namespace). Adding a "--tags" will make it fetch "refs/tags/*" too.

[OCLUG-Tech] "git fetch" versus "git fetch --tags"?

2015-06-28 Thread Robert P. J. Day
once again, into the pedantry of a git command. for an upcoming course, i'm writing a tutorial on how to start working with a remote, and i'm using the example of adding linux-next as a remote to the stock kernel, as explained here: https://www.kernel.org/doc/man-pages/linux-next.html but i

Re: [OCLUG-Tech] git

2012-01-25 Thread Rick Leir
On 24/01/2012 12:00 PM, linux-requ...@lists.oclug.on.ca wrote: >does that sound about right? and is there a single command that > would show all of that new content? thanks. > > rday You would get good answers to this type of question on stackoverflow.com ( I am not saying you don't get good

[OCLUG-Tech] Git job

2011-10-06 Thread Rob Echlin
No really, a job doing git stuff. Automating a system that currently uses Clear Case, to use git instead. Term position, that is intended to become a full time position - if the funding is made available, and it is expected. Wind River has a lot of jobs that are supposed to be in Alameda, but c

Re: [oclug-announce] Re: [OCLUG-Tech] Git Intro talk this Wednesday(at 7pm)

2008-07-26 Thread William Maclennan
This is my email Bill - Original Message - From: "Brenda J. Butler" <[EMAIL PROTECTED]> To: "Don LeBlanc" <[EMAIL PROTECTED]> Cc: "oclug-announce" <[EMAIL PROTECTED]>; Sent: Friday, July 18, 2008 8:03 AM Subject: Re: [oclug-announce] Re

Re: [oclug-announce] Re: [OCLUG-Tech] Git Intro talk this Wednesday (at 7pm)

2008-07-18 Thread Dan Langille
On Jul 18, 2008, at 8:03 AM, Brenda J. Butler wrote: Don, You can do this for yourself. There is a web interface on mailman: http://oclug.on.ca/mailman/listinfo For each list, subscribe at the new address, and unsubscribe the old one. There may be a GLOBAL switch there. In short, do i

Re: [oclug-announce] Re: [OCLUG-Tech] Git Intro talk this Wednesday (at 7pm)

2008-07-18 Thread Brenda J. Butler
Don, You can do this for yourself. There is a web interface on mailman: http://oclug.on.ca/mailman/listinfo For each list, subscribe at the new address, and unsubscribe the old one. bjb On Mon, Jul 07, 2008 at 04:28:29PM -0400, Don LeBlanc wrote: > Hi Bart and OCLUG, > > Can I ask you to

Re: [oclug-announce] Re: [OCLUG-Tech] Git Intro talk this Wednesday (at 7pm)

2008-07-18 Thread Don LeBlanc
y-To: linux@lists.oclug.on.ca To: oclug-announce <[EMAIL PROTECTED]>, linux@lists.oclug.on.ca Subject: [oclug-announce] Re: [OCLUG-Tech] Git Intro talk this Wednesday (at 7pm) Date: Mon, 7 Jul 2008 13:53:13 -0400 * Bart Trojanowski <[EMAIL PROTECTED]> [080707 13:48]: > I am giving anot

Re: [OCLUG-Tech] Git Intro talk this Wednesday (at 7pm)

2008-07-07 Thread Bart Trojanowski
* Bart Trojanowski <[EMAIL PROTECTED]> [080707 13:48]: > I am giving another intro talk on Git, the scalable revision control > system, for the local Ruby group. See below if you're interested in > attending. It seems that the original post didn't have the time specified. It would probably work

[OCLUG-Tech] Git Intro talk this Wednesday

2008-07-07 Thread Bart Trojanowski
Hi all, I am giving another intro talk on Git, the scalable revision control system, for the local Ruby group. See below if you're interested in attending. -Bart - Forwarded message from Jay Lawrence - Hi all, "Given that Git is quick becoming the de facto SCM for Ruby (and Rails and