[git-users] Re: Moving to git

2012-07-02 Thread Hardin Gaal
Hey - do you know that talk: http://www.youtube.com/watch?v=4XpnKHJAok8 greets... Am Sonntag, 1. Juli 2012 09:54:25 UTC+2 schrieb David MZ: Hello, I want to drive a move to git in my company that is currently using SVN, I was wondering if there are presentations that were already created

[git-users] Re: git status long time, gitignore

2012-07-02 Thread Thomas Ferris Nicolaisen
On Monday, July 2, 2012 6:40:02 AM UTC+2, jack sparrow wrote: i tried with git version 1.7.11.1, the issue still remains, this is a build repo from my organisation, unfortunately i can't replicate the build with that many files. GIT_TRACE is not helping either, it just throws the

[git-users] help merge delete 3000 files

2012-07-02 Thread git-guy
hi guys i dont knwo what happen but i make one merge and after um git push and deleted 3000 files in my project. how i can go back this merge? i tried git revert numbercommitbut not working? some help? -- You received this message because you are subscribed to the Google Groups Git for

[git-users] Re: Parameter format not correct

2012-07-02 Thread David Sanderson
Things are fine when I use Git Bash. I guess I'll stick with that. I probably selected option B (Run Git from the Windows Command Prompt). On Saturday, June 30, 2012 7:52:32 AM UTC-4, Thomas Ferris Nicolaisen wrote: That's weird. Could you try opening Git Bash, and running some git commands

[git-users] Re: help merge delete 3000 files

2012-07-02 Thread Thomas Ferris Nicolaisen
Hi, As long as you don't delete your local repository, you can always get the old code back out again. Whatever you do, do NOT delete your local repository. When you do a commit or a merge, it first and foremost only happens in your own local repository. This means that you can remove any

[git-users] Re: Parameter format not correct

2012-07-02 Thread Thomas Ferris Nicolaisen
On Monday, July 2, 2012 4:41:37 PM UTC+2, David Sanderson wrote: Things are fine when I use Git Bash. I guess I'll stick with that. I probably selected option B (Run Git from the Windows Command Prompt). That's generally a good idea. You might want to check out how I've wrapped Git Bash in

[git-users] Re: Commits only from specific branch

2012-07-02 Thread Nedvajz
Yes partly. I wanna to get via git submodule add http://example.com/submodulex.git; only data (commits files) of master branch and avoid of downloading any other commits of other branches. But I dont want to lose ability to update master branch with new commits. And in best way dont lose the

[git-users] Re: Moving to git

2012-07-02 Thread Daniel Dotsenko
The comment below non-withstanding, 1. the key to selling Git is Distributed In case of our business that part suddenly made it very easy to ship projects to outsourcing You can have contractors, mobile workers, other be able to work without tied to our VPN. 2. Parallel development made

Re: [git-users] git server problem

2012-07-02 Thread PJ Weisberg
On Monday, July 2, 2012, Avner Tamir avner.ta...@hp.com wrote: ,Hi I’ve set git server on RHEL 5.6 box, running on httpd we’ve encountered the following scenario several times User A pushes to remote User B pull from remote User B sees the sources pushed by user A as to be

Re: [git-users] git server problem

2012-07-02 Thread Wes Freeman
This happens sometimes if you have different default permissions on the files, I've found. It seemed to happen going between a mac and a windows client, for example. This might not be the same problem you're seeing, but I figured I would chime in, just in case it is of use. You can ignore changes

[git-users] Workflow for private and public branches

2012-07-02 Thread Japie
Hi, I have two branches in my project, A and B. A is the master branch and B is from A but includes code which should never be public. When I write code that needs to go to both branches I create a new branch from A, do the feature code, and then merge back into A and into B. But some

[git-users] Re: git status long time, gitignore

2012-07-02 Thread jack sparrow
On Jul 2, 5:17 pm, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Monday, July 2, 2012 6:40:02 AM UTC+2, jack sparrow wrote: i tried with git version 1.7.11.1, the issue still remains,  this is a build repo from my organisation, unfortunately i can't replicate the build with that

[git-users] git branching from tags

2012-07-02 Thread jack sparrow
From the git repo, i created a new branch1 with the existing tag tag1. i made some changes to a set of files, filea, fileb. If i run git status it shows that the filea and fileb are modified, so far good. Now i created another branch2 with the existing tag tag2. If i go toa filea, the file has the

Re: [git-users] git branching from tags

2012-07-02 Thread PJ Weisberg
On Monday, July 2, 2012, jack sparrow dafs...@gmail.com wrote: From the git repo, i created a new branch1 with the existing tag tag1. i made some changes to a set of files, filea, fileb. If i run git status it shows that the filea and fileb are modified, so far good. Now i created another

[git-users] Re: git branching from tags

2012-07-02 Thread jack sparrow
On Jul 3, 9:51 am, PJ Weisberg pjweisb...@gmail.com wrote: On Monday, July 2, 2012, jack sparrow dafs...@gmail.com wrote: From the git repo, i created a new branch1 with the existing tag tag1. i made some changes to a set of files, filea, fileb. If i run git status it shows that the filea

[git-users] Configuring https

2012-07-02 Thread Raviraj
My git.conf looks like following SetEnv GIT_PROJECT_ROOT /git/repos SetEnv GIT_HTTP_EXPORT_ALL #AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /gitrepos/$1 #AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /gitrepos/$1 ScriptAlias /git/