[git-users] Looking for a reccommendation of a GUI git interface for Windows

2012-09-10 Thread dmanexe
Hello, I am rolling out a git solution for one of my clients, but they're running Windows and I cannot think of a good GUI git client for Windows. The client wants to use git, and wants a GUI client, but doesn't want to pick what software they're using. Does anyone have a recommendation? Bonus

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

[git-users] Re: Install and configuration scenarios

2012-09-10 Thread Thomas Ferris Nicolaisen
On Monday, September 10, 2012 1:11:24 PM UTC+2, maxhodges wrote: > > I'm new to Git (have never used it yet), and have a couple questions about > basic install and config that I can't find clear answers to in the manual. > > I want to use Git for version control of web site development files (ht

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

[git-users] Install and configuration scenarios

2012-09-10 Thread maxhodges
I'm new to Git (have never used it yet), and have a couple questions about basic install and config that I can't find clear answers to in the manual. I want to use Git for version control of web site development files (html, css, php). Do I need to install it on my unix webserver? Or can I use t

Re: [git-users] Include empty folders

2012-09-10 Thread Serge Matveenko
On Sat, Sep 8, 2012 at 7:38 PM, Mindcast Mindcast wrote: > is there any way to include empty folders when i git commit without adding a > file (like .gitignore or .gitkeep) ? > > As long as i know there is no official way to do this. > > But, is this something it can be implemented maybe in a futu