[git-users] git_merge - files?

2014-03-20 Thread Göran
I've got a couple of files at the root of my repository named *.git_merge_a.* is a numerical value. Why are they created? What to do with them? Regards. Göran -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from

Re: [git-users] git_merge - files?

2014-03-20 Thread Konstantin Khomoutov
On Thu, 20 Mar 2014 00:32:33 -0700 (PDT) Göran gor...@gmail.com wrote: I've got a couple of files at the root of my repository named *.git_merge_a.* is a numerical value. Why are they created? What to do with them? Git itself does not create such files AFAIK. So supposedly they were

Re: [git-users] tracking clone activity from central

2014-03-20 Thread Konstantin Khomoutov
On Wed, 19 Mar 2014 14:01:38 -0700 (PDT) Bruce Hart bhart...@gmail.com wrote: i'm new to git so i don't know if i have the lingo down yet but here goes. is there a way to run a report to see any changes that have been made with the clone repos but not pushed yet to the central repo?

Re: [git-users] Bug report for git gui.

2014-03-20 Thread Konstantin Khomoutov
On Wed, 19 Mar 2014 14:34:09 -0700 (PDT) p@orange.fr wrote: Is it the right place to report bug on git gui? Or else where can I report git gui bug? Bugs against stock Git components should be reported on the main Git list -- please consult [1] for more details. 1.

Re: [git-users] git_merge - files?

2014-03-20 Thread Göran
Thank you for the response! I've investigated this further and found an wrapper for git (GitExtension) that we are using, suspectable to use these files. A quick scan of the sourcetree for this utility shows that it uses this filenames. But I didn't find any places where the files actually are

Re: [git-users] Can I use git as auto-updater

2014-03-20 Thread Nelson Efrain A. Cruz
Try to see if your bare repo (the one in htdocs) its being updated, try to clone it (git clone). Seems that there are no problems with the commands you are using, maybe some unneeded flags. For the files you need to leave untouched you can create a gitignore file where you can especify files and

Re: [git-users] Can I use git as auto-updater

2014-03-20 Thread Rustom Mody
On Thu, Mar 20, 2014 at 10:55 AM, Senjin Dragon senjin.the.dra...@gmail.com wrote: Let me sketch out what I'm trying to do. I'm not sure if I can use git for this or not. I think I can but I'm getting headaches going through the documentation and experimenting. It's all a bit confusing to me.