Re: [git-users] Process of branching

2012-09-10 Thread P Rouleau
And Thanks to you for your feed-back. On Monday, September 10, 2012 4:18:38 PM UTC-4, Patrick wrote: > > Now that I have done both methods and I confirmed that the state of the > local repo is pretty much the same, either method will work fine for me. I > have done this on my working local repo

Re: [git-users] Process of branching

2012-09-10 Thread Patrick
Now that I have done both methods and I confirmed that the state of the local repo is pretty much the same, either method will work fine for me. I have done this on my working local repo (using way 2) and even pushed it up to the remote just to test it completely. The first method moves (renam

Re: [git-users] Process of branching

2012-09-10 Thread Patrick
Thanks everyone. It has taken me awhile to try this out. So what I did was file system copy my local repo and then try the techniques offered. The first one was (note I named my branch parser): 1. git branch -m master parser 2. git fetch origin 3. git branch --track master origin/master 4. gi

Re: [git-users] Process of branching

2012-09-10 Thread P Rouleau
Yes I know the OP already made 12 commits. Like I say in my explication: "First we create a feature_branch_name on the tip of the local master, since it is ahead of the origin's one." The new feature_branch will include these 12 commits. I included the stash step because I do not know the statu

Re: [git-users] Process of branching

2012-09-10 Thread Rick DeNatale
OP = Original Poster On Mon, Sep 10, 2012 at 11:59 AM, Łukasz Siwiński wrote: > Ok, maybe I've misunderstood his problem. But now I'm sure I really know > what does your answer script do , thanks a lot :-) > > PS: what does mean OP in this context? > > Pozdrawiam, > > -- > Łukasz Siwiński > http:

Re: [git-users] Process of branching

2012-09-10 Thread Łukasz Siwiński
Ok, maybe I've misunderstood his problem. But now I'm sure I really know what does your answer script do , thanks a lot :-) PS: what does mean OP in this context? Pozdrawiam, -- Łukasz Siwiński http://siwinski.info Wysłano z telefonu. 10-09-2012 17:22, "Rick DeNatale" napisał(a): > On Mon, S

Re: [git-users] Process of branching

2012-09-10 Thread Rick DeNatale
On Mon, Sep 10, 2012 at 8:55 AM, Łukasz Siwiński wrote: > Hmm... > > > Local Repo 12 commits ahead of origin/master > > means, that You haven't pushed your last 12 commits to remote (@github) > origin/master branch > > if you do: > > git push > # what is the same as > git push origin master > > th

Re: [git-users] Process of branching

2012-09-10 Thread Łukasz Siwiński
Hmm... > Local Repo 12 commits ahead of origin/master means, that You haven't pushed your last 12 commits to remote (@github) origin/master branch if you do: git push # what is the same as git push origin master then You'll see your changes on github. 10-09-2012 14:14, "Rick DeNatale" napisał

Re: [git-users] Process of branching

2012-09-10 Thread Rick DeNatale
On Mon, Sep 10, 2012 at 7:25 AM, P Rouleau wrote: > Your steps seem to imply he must use the same new_branch_name in 1) and in > 5). We can simplify this by avoiding renaming the master branch. I believe > it is already tracking the github's origin. > > So the steps can be rewritten like this: >

Re: [git-users] Process of branching

2012-09-10 Thread P Rouleau
Your steps seem to imply he must use the same new_branch_name in 1) and in 5). We can simplify this by avoiding renaming the master branch. I believe it is already tracking the github's origin. So the steps can be rewritten like this: 1) git branch feature_branch_name 2) git stash 3) git fetch 4

Re: [git-users] Process of branching

2012-09-09 Thread Rick DeNatale
On Sun, Sep 9, 2012 at 12:53 PM, Patrick wrote: > Local Repo > 12 commits ahead of origin/master > > How do I take those 12 commits and pull them off on a branch? > I haven't tried this completely but since you haven't pushed the branch,I think something like 1) git branch -m master new_branch_

Re: [git-users] Process of branching

2012-09-09 Thread Patrick
Not at all, I'm trying to get my head around this so I don't mind any advice. I read through the branching section you pointed out and this help me see how git branching works and works in a workflow. So the nitty gritty of my situation is: Local Repo 12 commits ahead of origin/master How do

Re: [git-users] Process of branching

2012-09-07 Thread Bryce
Hi Patrick, Not to be condescending, but have you read this before: http://www.git-scm.com/book/en/Git-Branching-What-a-Branch-Is and if so, what was confusing about it. Maybe that will help us out in answering your question better. Warm regards, Bryce On 09/07/2012 09:37 AM, Patrick wrote:

Re: [git-users] Process of branching

2012-09-07 Thread Patrick
Yes have my remote working fine on GitHub. My question was on the process of branching. On Friday, September 7, 2012 9:20:00 AM UTC-7, Łukasz Siwiński wrote: > > Have You completed those 2 steps: > - https://help.github.com/articles/set-up-git > - https://help.github.com/articles/create-a-repo

Re: [git-users] Process of branching

2012-09-07 Thread Łukasz Siwiński
Have You completed those 2 steps: - https://help.github.com/articles/set-up-git - https://help.github.com/articles/create-a-repo ? Pozdrawiam, -- Łukasz Siwiński http://siwinski.info Wysłano z telefonu. 07-09-2012 17:16, "Patrick" napisał(a): > Been using git (with GitHub) for awhile now but

[git-users] Process of branching

2012-09-07 Thread Patrick
Been using git (with GitHub) for awhile now but I have to admit I've never really gotten over the cvs & svn mind set of the local repo. I've been on a project for awhile and have not really needed to use branches but I have been working on my local repo for awhile and have not pushed up the to