[git-users] Re: Issue on Windows Server 2008 R2

2013-01-15 Thread Thomas Ferris Nicolaisen
On Tuesday, January 15, 2013 4:57:19 PM UTC+1, Bart Baker wrote: > Hello, > > I am running Git 1.7.11-preview 20120710 (take from the msysgit Google > Code > site) on Windows Server 2008 R2. We performed a standard 32bit fresh > installation and Git seems to run fine for a few days. > > After

[git-users] Re: git merge: error: The following untracked working tree files would be overwritten by merge

2013-01-15 Thread Thomas Ferris Nicolaisen
On Tuesday, January 15, 2013 11:48:33 PM UTC+1, Carsten wrote: > Hi again, > > Am 11.01.2013 11:38, schrieb Carsten Fuchs: > > [...] > > So my real question is, why does Git not do something analogous? > > (Afaics, update the HEAD, update the Index, but leave the working-copy > edition alone?

[git-users] Re: git grief

2013-01-15 Thread Thomas Ferris Nicolaisen
On Wednesday, January 16, 2013 1:07:54 AM UTC+1, JavaSrvcs wrote: > I have not changed any code and just tried to do a git pull and get the > following message: > > Updating 527f1ee..18cf73e > error: Your local changes to the following files would be overwritten by > merge: > java//I

Re: [git-users] git grief

2013-01-15 Thread IƱigo Medina
On Tue, Jan 15, 2013 at 04:07:54PM -0800, JavaSrvcs wrote: > I have not changed any code and just tried to do a git pull and get the > following message: > > Updating 527f1ee..18cf73e > error: Your local changes to the following files would be overwritten by > merge: > java//Info.ja

Re: [git-users] git grief

2013-01-15 Thread William Seiti Mizuta
Try to do a git fetch and post the result of the commands git status and git diff --stat master origin/master William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Jan 15, 2013 at 10:07 PM, JavaSrvcs wrote: > I have not changed any code and just tried to do a git pull and get th

[git-users] git grief

2013-01-15 Thread JavaSrvcs
I have not changed any code and just tried to do a git pull and get the following message: Updating 527f1ee..18cf73e error: Your local changes to the following files would be overwritten by merge: java//Info.java Please, commit your changes or stash them before you can merge. Abortin

[git-users] Re: git merge: error: The following untracked working tree files would be overwritten by merge

2013-01-15 Thread Carsten Fuchs
Hi again, Am 11.01.2013 11:38, schrieb Carsten Fuchs: [...] So my real question is, why does Git not do something analogous? (Afaics, update the HEAD, update the Index, but leave the working-copy edition alone?) I searched for this beforehand, and most advice involves either stashing, or wit

[git-users] Re: git pull username & password prompt

2013-01-15 Thread Philipp Kraus
Am Sonntag, 13. Januar 2013 13:32:10 UTC+1 schrieb Thomas Ferris Nicolaisen: > > Could it be that Apache (or whatever webserver you use) is not correctly > configured? Please post the details of your environment along with the > Apache configuration. > I don't think so, I have used the descri

Re: [git-users] Git attributes smudge/clean filters

2013-01-15 Thread Konstantin Khomoutov
On Tue, 15 Jan 2013 08:17:50 -0800 (PST) Russell wrote: [...] > > That way your repository always keeps "normalized" blobs. > > I agree that this is exactly what I would do to mimic RCS behaviour. > But I am deliberately trying not to for the reason described below: > > Unfortunately using th

Re: [git-users] Git attributes smudge/clean filters

2013-01-15 Thread Russell
On Friday, January 11, 2013 5:41:39 PM UTC-5, Dale Worley wrote: > > > Half of your problem is clear: When you check in a file, the > version that gets into the repository is processed as you've arranged for > it > to be. But of course, that doesn't change the file in the working > copy, be

Re: [git-users] Git attributes smudge/clean filters

2013-01-15 Thread Russell
On Friday, January 11, 2013 5:41:57 PM UTC-5, Konstantin Khomoutov wrote: > > You seem to misunderstand the concept a bit. > The blobs kept in the repo should have some neutral placeholder, such as > to read something like "Last modified $Timestamp$" in them. > > Then, in the smudge filter, wh

[git-users] Issue on Windows Server 2008 R2

2013-01-15 Thread Bart Baker
Hello, I am running Git 1.7.11-preview 20120710 (take from the msysgit Google Code site) on Windows Server 2008 R2. We performed a standard 32bit fresh installation and Git seems to run fine for a few days. After a few days though, the installation seems to go sour. After launching a Command Prom

Re: [git-users] git request-pull? how to?

2013-01-15 Thread lei yang
On Tue, Jan 15, 2013 at 5:33 AM, Konstantin Khomoutov wrote: > On Tue, 15 Jan 2013 19:30:04 +0800 > lei yang wrote: > >> I always see something like >> http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/54774 > > Looks like the result of `git format-patch` with the "--cover-

[git-users] Re: rev-parse --is-inside-work-tree never returns false?

2013-01-15 Thread Tim Chase
On 01/15/13 00:25, Thomas Ferris Nicolaisen wrote: On Tuesday, January 15, 2013 3:24:34 AM UTC+1, Tim Chase wrote: However, when I try "git rev-parse --is-inside-work-tree" outside my repo, I get fatal: Not a git repository (or any parent up to mount point /home) Stopping at filesystem boundary

Re: [git-users] Re: Find Git repository mapping

2013-01-15 Thread John McKown
Konstantin gave you a good answer. But I'll put in one from my newbie self. When you create a new repo, and you use a "git clone" command. That automatically sets up a remote called "origin" with a URL which is where you cloned from. E.g. I did: git clone https://github.com/git/git and in the g

Re: [git-users] Re: Find Git repository mapping

2013-01-15 Thread Konstantin Khomoutov
On Tue, 15 Jan 2013 04:56:31 -0800 (PST) Floriano Fauzzi wrote: > >> I want to know what is the file where, Git portable or Git stand > >> alone software, store the mapping between the clone repository > >> ( on pc ) and the web repository. > >> I need this information because I know that clone r

Re: [git-users] git request-pull? how to?

2013-01-15 Thread Konstantin Khomoutov
On Tue, 15 Jan 2013 19:30:04 +0800 lei yang wrote: > I always see something like > http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/54774 Looks like the result of `git format-patch` with the "--cover-letter" command-line argument used. --

[git-users] Re: Find Git repository mapping

2013-01-15 Thread Floriano Fauzzi
Hi Thomas, thanks for the answer. I'm sorry, I didnt explain my question clearly. I try to clarify it by this scenario: "Paul has a repository on GitHub called *rep1 *with some files. On his pc, Paul clones it into the local repo called *rep2 *and stored, say, in C:\ " Now the question is: How d

[git-users] Re: Find Git repository mapping

2013-01-15 Thread Thomas Ferris Nicolaisen
On Tuesday, January 15, 2013 12:37:25 PM UTC+1, Floriano Fauzzi wrote: > Hi, > I want to know what is the file where, Git portable or Git stand alone > software, store the mapping between the clone repository ( on pc ) and the > web repository. > I need this information because I know that clone

[git-users] Find Git repository mapping

2013-01-15 Thread Floriano Fauzzi
Hi, I want to know what is the file where, Git portable or Git stand alone software, store the mapping between the clone repository ( on pc ) and the web repository. I need this information because I know that clone repository could have a different name compared to web repository. Thanks for th

[git-users] git request-pull? how to?

2013-01-15 Thread lei yang
Hi experts I always see something like http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/54774 Then it follows patches, I don't know how to get the first one, which is not code changes but some info like "changes since vx", and then list the modified files I also see somet

[git-users] git request-pull? how to

2013-01-15 Thread lei yang
--