[git-users] Breakage in UMTSFemto GIT repository

2014-08-15 Thread ab
Hi all, I am trying to create a GIT clone and followed below steps 1. Set Environment Variables a. export PATH=/auto/mitg-sw/tools/debian/git/bin:/auto/mitg-sw/tools/bin:$PATH 2. Generate Keys a. ssh-keygen -t rsa b. chmod 700 ~/.ssh c. chmod go-w ~ d. ca

[git-users] Using git

2014-08-15 Thread Akhilesh Yadav
Hi All, I am new to git. I was thinking to setup local git repository.I have Centos 6.5 server where I am planning to install git.There will be 5 person pushing and pulling data from the git repository.I am confused about it how they will push and pull data from the server.What the actual proce

[git-users] Create a patchset between two linux kernel branches

2014-08-15 Thread Matthias Klein
I triy to create a patchset between: https://github.com/raspberrypi/linux.git branch rpi-3.12.y and git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git tag 3.12.26 I cloned the first tree, added the second tree as remote and fetched the tree. Then I tried commands like:

[git-users] post-receive not invoking on windows server 2008

2014-08-15 Thread Sujith K
Hi, Q1) When pushing a tag from eclipse to remote windows server, post-receive server hook not getting invoked. assume, script execution will create a sample file. Somebody plz help me to figure it out why script not getting executed. - #!/bin/sh touch abc.txt echo "Trying to Invoke

[git-users] Problem with commit

2014-08-15 Thread DavidFreed
Dear Friends, I have this problem with Git , please advice me. git commit -am "commit all" # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # # Untracked files: # (use "git add ..." to include in what will be committed) # # .GroupFileLoggerBolt.java.swp # ..

[git-users] Breakage in UMTSFemto GIT repository

2014-08-15 Thread ab
Hi all, I am trying to create a GIT clone and followed below steps 1. Set Environment Variables a. export PATH=/auto/mitg-sw/tools/debian/git/bin:/auto/mitg-sw/tools/bin:$PATH 2. Generate Keys a. ssh-keygen -t rsa b. chmod 700 ~/.ssh c. chmod go-w ~ d. ca

[git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Suh-Shin hwang
Hi all, I copied a project from computer A to computer B using a USB stick. I modified some parts of the project in computer B and now I want to reflect this change in computer A. I'm using BitBucket for the server. How might I use Git in this situation? Do I create a new repository in computer

Re: [git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Gergely Polonkai
The information you gave is a bit loosy. Do you have modifications on A, or everything in A is pushed to BitBucket? How did you copy your repository from A to B? Did you just copy the directory, or used git clone to create a second one? Are you using branches, or everything you do is on master?

Re: [git-users] Using git

2014-08-15 Thread Konstantin Khomoutov
On Wed, 13 Aug 2014 05:09:13 -0700 (PDT) Akhilesh Yadav wrote: > I am new to git. I was thinking to setup local git repository.I have > Centos 6.5 server where I am planning to install git.There will be 5 > person pushing and pulling data from the git repository.I am confused > about it how they

Re: [git-users] Breakage in UMTSFemto GIT repository

2014-08-15 Thread Magnus Therning
On Fri, Aug 08, 2014 at 09:15:09AM -0700, ab wrote: > Upto step 4(a) everything is working fine but when I am trying to > fire git populate utils suites/BaseClasses suites/UMTSFemto command > I get below error > > anisal@rtppnkvm36-vm1 Temp]$cd autotest.mainline/ > anisal@rtppnkvm36-vm1 autotest.m

[git-users] Re: Problem with commit

2014-08-15 Thread Thomas Ferris Nicolaisen
On Saturday, August 9, 2014 4:24:05 PM UTC+2, DavidFreed wrote: > > Dear Friends, > I have this problem with Git , please advice me. > > git commit -am "commit all" > > > As the output tells you, there's nothing to commit here. You can add new files to Git by doing git add , but all those untracke

Re: [git-users] Problem with commit

2014-08-15 Thread Dale R. Worley
> From: DavidFreed > > Dear Friends, > I have this problem with Git , please advice me. > > git commit -am "commit all" Please tell us what you do not like about Git's behavior. This will give you some advice: http://www-mice.cs.ucl.ac.uk/multimedia/software/documentation/ReportingBugs.html D

[git-users] post-merge hook not running

2014-08-15 Thread Etienne Pouliot
Hello, I'm trying to get my post-merge hook to run but I can't get it to work. Here is my test hook : /salt/.git/hooks/post-merge #!/bin/sh echo "pafafds" touch /tmp/githook.txt It is executable and I'm doing my git pull with my root account : # ls -l /salt/.git/hooks/post-merge

Re: [git-users] post-merge hook not running

2014-08-15 Thread Konstantin Khomoutov
On Fri, 15 Aug 2014 07:06:51 -0700 (PDT) Etienne Pouliot wrote: > I'm trying to get my post-merge hook to run but I can't get it to > work. [...] > #git pull > remote: Counting objects: 5, done. > remote: Compressing objects: 100% (4/4), done. > remote: Total 4 (delta 2), reused 0 (delta 0) > Unp

Re: [git-users] post-merge hook not running

2014-08-15 Thread Etienne Pouliot
That make sense. Any other way to run a hook everytime I do a "git pull" ? On Friday, August 15, 2014 10:47:49 AM UTC-4, Konstantin Khomoutov wrote: > > On Fri, 15 Aug 2014 07:06:51 -0700 (PDT) > Etienne Pouliot > wrote: > > > I'm trying to get my post-merge hook to run but I can't get it to

Re: [git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Suh-Shin hwang
Hi Gergely, 1. I have modifications on A and I did not use Git of any kind when I copied the file to computer B. I simply copied the files from A into a USB stick to B, created a repo on B, did some modifications then pushed to BitBucket. 2. Everything is on master right now. -- You received

Re: [git-users] Using git

2014-08-15 Thread Yingshou Guo
One of the simplest ways to do what you want: 1, setup a bare,shared repository in a machine: git init --bare --shared myrepo.git 2, make it accessible through ssh protocol(setup ssh server and make an account for every developer) 3, clone the repo: git clone ssh://@server//myrepo.git 4, you are d