Re: [git-users] Can I get back local, un-added files that have been erased by a checkout?

2011-09-18 Thread Philip Oakley
From: Ben Chang benchan...@gmail.com Hi, hope someone can help ... I'm very confused ... I'm using git-gui on windows. I created a new file in my project source directory. I'm fond of it - in fact it is the successful culmination of months of work - so I decide I want to keep it. I fire up

Re: [git-users] Search for the instrument with the possibility of sharing rights.

2011-09-21 Thread Philip Oakley
From: PavelVDobryakov pdobrya...@gmail.com Hello, please tell me - is-there any tool to implement the separation of user rights to groups of users, the rights to the branches, repositories? Gitolite is the tool that comes up as the one to use. Philip -- You received this message because you

Re: [git-users] gsoc 2012 project

2012-03-21 Thread Philip Oakley
From: Raman Gupta royalbird.ra...@gmail.com Sent: Wednesday, March 21, 2012 4:14 PM Raman, The g...@vger.kernel.org would be the right list for the GSoC '12 discussions. There are already plenty of discussions on that list http://news.gmane.org/gmane.comp.version-control.git Philip Hello

Re: [git-users] feasibility and implementation of a tree-structured development process

2012-04-23 Thread Philip Oakley
Achieving such a change is a often more of a social problem than a technical one... From: Tom Roche tom_ro...@pobox.com Sent: Monday, April 23, 2012 1:06 AM summary: background, motivation, and plan for a tree-structured development process is presented. My question is (roughly), should the

Re: [git-users] Cannot update git from 1.7.5.4 OSX Lion

2012-05-09 Thread Philip Oakley
Check you don't now have two versions installed, and you default execution path/icon may still be pointing to the old one. Also confirm that you have simply installed Git for Windows (the executable in c:\program files), rather than the Msysgit development environment. I've ended up with

Re: [git-users] Re: Basic question: confusing messages with git merge

2012-05-10 Thread Philip Oakley
From: Brad Malone To: git-users@googlegroups.com Sent: Thursday, May 10, 2012 5:07 PM Subject: Re: [git-users] Re: Basic question: confusing messages with git merge Thomas and Antony, Thank you both for taking time to write such detailed responses to my question! Now let me get to

Re: [git-users] Submodule commit of different branch

2012-05-18 Thread Philip Oakley
- Original Message - From: Adros To: git-users@googlegroups.com Sent: Thursday, May 17, 2012 8:14 AM Subject: [git-users] Submodule commit of different branch Hello, is it possible to find out, which commit of submodule is a branch I am not currently on pointing

Re: [git-users] Merge Conflict

2012-05-22 Thread Philip Oakley
From: Andrew Hardy andrew_ha...@hardysoft.co.uk Sent: Tuesday, May 22, 2012 6:59 PM I have changed the git ignore file to ignore *.suo however I had a *.suo file which will not merge from one branch to another because it is binary. So i deleted it from the merge to branch thinking this would

Re: [git-users] How to make a new branch with a portion of a branch?

2012-06-17 Thread Philip Oakley
From: Eric Parent parent.eri...@gmail.com Sent: Sunday, June 17, 2012 2:12 PM Hi, I've been working on a branch, say '2.1' and made a few commits on it. We've made a release and tagged the changeset at which the commit was produced, say 'tag2.1'. Development continued and a few more

Re: [git-users] Re: Documentation discrepancy

2012-06-24 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net To: git-users@googlegroups.com Cc: Git User usv299792...@gmail.com Sent: Friday, June 22, 2012 2:40 PM Subject: Re: [git-users] Re: Documentation discrepancy On Thu, 21 Jun 2012 18:06:29 -0700 (PDT) Git User usv299792...@gmail.com

Re: [git-users] how to merge to separate repositories.

2012-06-28 Thread Philip Oakley
You can use Grafts as a method for linking between the two repos to give the appearance that the history is continuous [apparently it was used for adding the early Linux history]. This does not change any of the sha1 values so their use in validating the complete history won't be valid. Also

Re: [git-users] Re: Italian Translation of the documentation

2012-07-09 Thread Philip Oakley
Hi Jiang Xin worldhello@gmail.com coordinates the localisation (l10n) of the git messages. Have a look on the main git archive e.g. http://git.661346.n2.nabble.com/ or http://news.gmane.org/gmane.comp.version-control.git for some of the discusions. e.g. the latest request

Re: [git-users] Beginner stuck in a commit

2012-08-07 Thread Philip Oakley
- Original Message - From: Jeffery Brewer To: git-users@googlegroups.com Sent: Tuesday, August 07, 2012 3:57 AM Subject: [git-users] Beginner stuck in a commit I've slowly been trying to get git to work and just running into loads of problems. Using the windows bash I

Re: [git-users] Server Error or User Error?

2012-08-14 Thread Philip Oakley
- Original Message - From: stewpend0us To: git-users@googlegroups.com Sent: Tuesday, August 14, 2012 1:14 AM Subject: [git-users] Server Error or User Error? Tried to create a repository on a network drive which caused git to freeze. Always froze on the git add .

Re: [git-users] Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
Isn't a shallow clone a good use case for this? You only need the latest commit of each project you want to build and then it either works or it doesn't, and the clone is then deleted. So is 'git clone --depth depth' what you need? Use depth := 1 Just a thought Philip - Original

[git-users] Re: Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
not directly clone xyz remotely and get the same result as with the local clone? Am Donnerstag, 30. August 2012 09:00:04 UTC+2 schrieb Philip Oakley:  Isn't a shallow clone a good use case for this? You only need the latest commit of each project you want to build and then it either works

[git-users] Re: Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
UTC+2 schrieb Philip Oakley: On Aug 30, 11:34 am, Haasip Satang haasip.sat...@googlemail.com wrote: ;-) That's what I did as you can see in my explanation above ;-) The problem still seems to be that it only works locally on the same linux machine. When I try to clone from any remote

Re: [git-users] Automatic repacking when cloning

2012-09-03 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Monday, September 03, 2012 7:29 PM On Mon, 3 Sep 2012 10:51:30 -0700 (PDT) Haasip Satang haasip.sat...@googlemail.com wrote: I'm having a question regarding the packs and the repacking of those during cloning. [...] On this big

Re: [git-users] git checkout file silently fails

2012-09-04 Thread Philip Oakley
If both cases of checking out a path you are expected to provide a tree-ish, not a branch. The git glossary says that a tree-ish is a commit, tree, or tag - nothing about a branch. The corner case is probably hidden inside that aspect of the wording. If you can think of a succinct phrase

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

2012-09-11 Thread Philip Oakley
- Original Message - From: Lars Pensjö To: git-users@googlegroups.com Cc: Lars Pensjö Sent: Tuesday, September 11, 2012 8:04 PM Subject: Re: [git-users] Looking for a reccommendation of a GUI git interface for Windows A little confusing.

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

2012-09-12 Thread Philip Oakley
On Tuesday, 11 September 2012 03:39:18 UTC+1, dmanexe wrote: 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

Re: [git-users] Changed but not updated and Changes not staged for commit

2012-09-16 Thread Philip Oakley
From: Ivan Ionut To: git-users@googlegroups.com Sent: Sunday, September 16, 2012 7:06 PM Subject: [git-users] Changed but not updated and Changes not staged for commit Well after i modified a file... after git status: # Changes not staged for commit: # (use git add file... to

Re: [git-users] GIT MALWARE

2012-09-17 Thread Philip Oakley
On Monday, September 17, 2012 1:48:33 PM UTC+1, Ex wrote: And the email was: g...@vger.kernel.org javascript: The git@vger mailing list is actually for Git (linux) source, and only accepts plain text mail. Any HTML mail is unceremoniously binned by the vger host (which covers lots of

Re: [git-users] Creating an up-to-date version of master branch on network drive

2012-09-21 Thread Philip Oakley
From: Bart Baker bart...@gmail.com Hello, What I'd like to do is have a copy of the code that always sits on a shared drive visible to multiple users. I have a situation where users who don't use Git would like to occasionally view the code base without editing it. Could I somehow have the

Re: [git-users] Forcing a push from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Sent: Tuesday, September 25, 2012 7:31 PM Subject: [git-users] Forcing a push from one branch to another Hello, If possible please humor me and attempt to answer this question: How do I make b look exactly like a using one

Re: [git-users] Forcing a push from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Cc: Chris Stankevitz ; Philip Oakley Sent: Tuesday, September 25, 2012 8:01 PM Subject: Re: [git-users] Forcing a push from one branch to another On Tuesday, September 25, 2012 11:48:25 AM UTC-7, Philip Oakley wrote: Do you

Re: [git-users] to install git at bluehost

2012-09-30 Thread Philip Oakley
The x.x is a shorthand for the many incremental and minor development updates. However, the main storage has moved. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list; Junio Hamano, the maintainer, announces the new and maintenance releases on

Re: [git-users] Re: git can't push a specific link file to the remote server??

2012-10-06 Thread Philip Oakley
The Mac OS HFS mangles various non-ascii characters. So what you put in and what you get back (filenames) don't always match because the encodings and composings of special characters changes. There is an upgrade to git going through at the moment that will cononicalise [make consistent] the

Re: [git-users] git clone algorithm

2012-10-09 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net On Tue, 9 Oct 2012 09:35:03 -0700 (PDT) Cristea Bogdan crist...@gmail.com wrote: I am wondering what algorithm is used by git clone command ? When cloning from remote repositories, if there is a link failure and the same command is

Re: [git-users] Unable to push

2012-11-05 Thread Philip Oakley
Is your remote a 'bare' repository, or does it have a working directory? -- I ask because you say you are working on the branch on both sides. It is normal to have your remote as a 'bare' repo, though you can manage if both are 'working' but in such cases you would use different branches on

Re: [git-users] GIT commercial licence

2012-11-14 Thread Philip Oakley
https://github.com/git/git/blob/master/COPYING - Original Message - From: Philip Oakley To: Srinivas reddy kukunoor ; git-users@googlegroups.com Sent: Wednesday, November 14, 2012 12:53 AM Subject: Re: [git-users] GIT commercial licence Git is actually licenced under

Re: [git-users] deletion of git object?

2012-11-26 Thread Philip Oakley
From: John McKown To: git-users@googlegroups.com Sent: Monday, November 26, 2012 6:07 PM Subject: [git-users] deletion of git object? OK, this is more a question to help me understand git internals than an actual problem that I am having. But suppose I create a new branch. git

Re: [git-users] Pushing files into a subtree

2012-11-29 Thread Philip Oakley
From: Dale R. Worley wor...@alum.mit.edu To: git-users@googlegroups.com Sent: Thursday, November 29, 2012 7:50 PM Subject: Re: [git-users] Pushing files into a subtree From: Ryan Hodson hodson.r...@gmail.com If you're not looking for a submodule, you can just move the tracked files into a

Re: [git-users] Where to file bug reports???

2012-12-06 Thread Philip Oakley
The g...@vger.kernel.org is the right address for the main git developer list. HOWEVER it does require you to send plain text messages. All HTML is rejected out of hand by the vger.kernel.org lists. It's archive is on http://news.gmane.org/gmane.comp.version-control.git If you are Git for

Re: [git-users] How to list a directory content with Git or GitHub

2012-12-08 Thread Philip Oakley
git-ls-files - Show information about files in the index and the working tree (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])* - Original Message - From: Fanta To: git-users@googlegroups.com Sent: Saturday, December 08, 2012 4:03 PM Subject: [git-users] How

Re: [git-users] securing data in a non-local repository

2012-12-11 Thread Philip Oakley
- Original Message - From: John McKown To: git-users@googlegroups.com Sent: Tuesday, December 11, 2012 7:44 PM Subject: [git-users] securing data in a non-local repository I haven't seen anything like this in anything I've read so far. And I know that git is all about

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Philip Oakley
From: Dale R. Worley wor...@alum.mit.edu Sent: Wednesday, December 12, 2012 5:48 PM From: Philip Oakley philipoak...@iee.org Another question is this: I believe that the complete repository and its status lives in the .git directory. So if I move ./.git to ../.git, it has the same

Re: [git-users] interesting? observation about git mv propagation

2012-12-13 Thread Philip Oakley
If I understand correctly [*1*] what you did during this Pull was to get the data from your home bare repo to your work machine for git to decode, and then for git to feed the results back to your home working repo, so taking a full ssh round trip (ssh encoded both ways). That is, you maybe

Re: [git-users] GIT get corrupted on lustre filesystem

2012-12-23 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Sunday, December 23, 2012 6:26 PM On Sun, 23 Dec 2012 07:17:30 -0800 (PST) Eric Chamberland eric.chamberl...@gmail.com wrote: we are experiencing many problemes like those described here:

Re: [git-users] Keep local repo small

2012-12-23 Thread Philip Oakley
From: Francesco Rugiano To: git-users@googlegroups.com Sent: Sunday, December 23, 2012 8:57 PM Subject: [git-users] Keep local repo small Hello I have a question and i didn't manage to get an answer. I am in this situation: Remote repository - hosted on bitbucket Local

Re: [git-users] Help! Git pull deleted files.

2012-12-28 Thread Philip Oakley
My guess would that you did a 'commit amend' (or small rebase) locally that slightly changed your line of development relative to your last push. As far as the git sha1 hash is concerned a slight change and a ginormous change are the same 'they are different'! - Original Message -

Re: [git-users] Problem with moving everything into a subdirectory; merge conflicts

2013-01-06 Thread Philip Oakley
Surley (?) the simplest method, given your limited number of branches, is to capture and repeat the moves as a script once for each branch, so that each branch has a flag day commit. Then the development merging should proceed just fine. At least then the file rename machinery has much less

Re: [git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-06 Thread Philip Oakley
everything into a subdirectory; merge conflicts Hi Philip, Am 2013-01-06 14:59, schrieb Philip Oakley: Surley (?) the simplest method, given your limited number of branches, is to capture and repeat the moves as a script once for each branch, so that each branch has a flag day commit

Re: [git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-07 Thread Philip Oakley
From: Carsten Fuchs carsten.fu...@cafu.de Sent: Monday, January 07, 2013 9:21 AM Hi Philip, Am 2013-01-06 18:21, schrieb Philip Oakley: Your issue [my mistake] is that the (gits's) merge process is a three way merge, so you have the two commits F and N to merge, but git will also locate

Re: [git-users] Management of a puppet tree and multiple developers

2013-01-08 Thread Philip Oakley
More people essentially means you will want more branches (complexity got just too big for the two branch model), probably one per feature, branched off devel and re-merged [either feature - devel; or devel(latest) -feature depending on flow] whenever a feature is ready for testing. Once a

Re: [git-users] Trying to convert svn repos to Git repos

2013-01-21 Thread Philip Oakley
My quick web search found http://julipedia.meroh.net/2012/02/converting-subversion-repository-to-git.html The only little problem is that git svn does not recognize Subversion tags as such and therefore converts them to Git branches instead of tags. Is that part of the problem? Or is it that

Re: [git-users] How to contribute to documentation translation?

2013-01-26 Thread Philip Oakley
Tamer, If you look bottom left of the page you linked it indicates it is hosted on Gitbub at https://github.com/github/gitscm-next Browse through it to locate the Arabic version and do the Git thing [fork - update - push - Pull request].. If you are thinking of significant improvements, do

Re: [git-users] How to contribute to documentation translation?

2013-01-26 Thread Philip Oakley
It liiks like it needs a link here - https://github.com/progit/progit/tree/master/ar for the book's source file (rather than the code that creates the web pages) - Original Message - From: Philip Oakley To: Tamer Shlash ; git-users@googlegroups.com Sent: Saturday, January 26

Re: [git-users] How to contribute to documentation translation?

2013-01-28 Thread Philip Oakley
/ -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html - Philip - Original Message - From: Philip Oakley To: Tamer Shlash ; git-users

Re: [git-users] Managing legacy projects with lots of (and mainly) patches

2013-01-29 Thread Philip Oakley
From: Dale R. Worley wor...@alum.mit.edu Sent: Tuesday, January 29, 2013 7:40 PM From: ryez rye...@gmail.com 1. we use the master branch to reflect what we have in production 2. for every patch, a separate patch branch is created from master 3. when a patch is ready to release/deploy, we first

Re: [git-users] Re: Why Same Files show up with different Statuses in Git?

2013-01-31 Thread Philip Oakley
Message - From: Matthew Johnson To: git-users@googlegroups.com Cc: Matthew Johnson ; Philip Oakley Sent: Thursday, January 31, 2013 7:53 PM Subject: Re: [git-users] Re: Why Same Files show up with different Statuses in Git? Hi, Philip- Thanks for the response. Which

Re: [git-users] Re: Rebasing problems

2013-02-01 Thread Philip Oakley
Is this what they call an 'Evil Merge' (git style) where the final content was not in either of the original commits. In such cases it's hard to attribute which source commit contained the data that is in the merge. It's as if an additional change was added, over and above choosing between

Re: [git-users] A plead for more meaningful syntax

2013-02-03 Thread Philip Oakley
There have been a few threads on the subject in the git developers list [g...@vger.kernel.org] This one being possibly the most relevant http://thread.gmane.org/gmane.comp.version-control.git/185825/focus=206910 Many of the design 'choices' are buried in history and are a mixture of needing

Re: [git-users] A plead for more meaningful syntax

2013-02-03 Thread Philip Oakley
From: Malusi Gcakasi malusi.gcak...@gmail.com Sent: Sunday, February 03, 2013 10:09 AM On 2/3/2013 8:02 AM, Les Nightingill wrote: It will help you a lot with the syntax to really understand the architecture and the data model. I'm also pretty new to using git, can you recommend any good

[git-users] Compiling Git on Linux..

2013-02-03 Thread Philip Oakley
I have recently got a spare laptop and installed Linux (I've been on Windows since 3.1, and stuff before that) , and I'm trying to get my head around some of the Git install issues on Linux. In particular how to compile my own version of Git, separate from the installed version. I've got

Re: [git-users] Compiling Git on Linux..

2013-02-03 Thread Philip Oakley
can invoke your version by entering: /usr/local/bin/git On Feb 3, 2013 11:34 AM, Philip Oakley philipoak...@iee.org wrote: I have recently got a spare laptop and installed Linux (I've been on Windows since 3.1, and stuff before that) , and I'm trying to get my head around some of the Git

Re: [git-users] Compiling Git on Linux..

2013-02-03 Thread Philip Oakley
My missing step was the next step listed on the web page 'sudo make prefix=/usr/local all' This then did the business of populating the /usr/local/bin directory. Not really sure what extradifference it makes... - Original Message - From: Philip Oakley To: git-users

Re: [git-users] Compiling Git on Linux..

2013-02-03 Thread Philip Oakley
On 03/02/13 23:43, Konstantin Khomoutov wrote: On Sun, Feb 03, 2013 at 05:34:00PM +, Philip Oakley wrote: I have recently got a spare laptop and installed Linux (I've been on Windows since 3.1, and stuff before that) , and I'm trying to get my head around some of the Git install issues

Re: [git-users] Compiling Git on Linux..

2013-02-04 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Monday, February 04, 2013 9:47 AM On Mon, 04 Feb 2013 07:42:26 + Philip Oakley philipoak...@iee.org wrote: [...] Hi, yes, I was really wanting to hack on the latest version. I've done a bit on the Msysgit version before

Re: [git-users] GiT + Software revision + Branching

2013-02-05 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Tuesday, February 05, 2013 6:08 PM On Tue, 5 Feb 2013 06:17:56 -0800 (PST) Jacques Knipper jacques.knip...@gmail.com wrote: [...] The basic idea is that your code base evloves and at some point you decide that its current state

Re: [git-users] .gitattributes merge=ours doesn't work on msysgit?

2013-02-05 Thread Philip Oakley
From: Andrew Arnott Sent: Saturday, February 02, 2013 6:51 PM I've just learned about merge=ours in .gitattributes from the Pro Git book. I have a file that I always want to resolve by keep ours. So I created a .gitattributes file in the directory where the file is found with this content:

Re: [git-users] fixing detached branches left after svn2git

2013-02-07 Thread Philip Oakley
From: Julian Sikorski Sent: Thursday, February 07, 2013 9:00 PM Hi, I have migrated an SVN repository to git using svn2git. The problem is that, for some reason, the branching points did not get ported over, so now I have the branches sort of parallel to one another. Is there a way to add

Re: [git-users] Help with .gitignore

2013-02-20 Thread Philip Oakley
From: Tom Avey To: git-users@googlegroups.com Sent: Wednesday, February 20, 2013 9:46 PM Subject: [git-users] Help with .gitignore I could use some help with gitignore. I set up a .gitignore file in the root of my project with a line for WEB-INF. Before setting up that .gitignore,

Re: [git-users] how to get the code changes of another person to my local code?

2013-02-20 Thread Philip Oakley
From: www To: git-users@googlegroups.com Sent: Wednesday, February 20, 2013 9:32 PM Subject: [git-users] how to get the code changes of another person to my local code? Hi: I have used git for a while, but only for keeping tracking of the changes of my own in my own computer. I

Re: [git-users] Help with .gitignore

2013-02-20 Thread Philip Oakley
be a very good idea to use the --cached otherwise the actual files will also be removed from the WEB-INF subdirectory. Been there, done that. Luckily I was able to recover by doing a git checkout HEAD^ -- files. On Wed, Feb 20, 2013 at 4:05 PM, Philip Oakley philipoak...@iee.org wrote

Re: [git-users] git wont pull

2013-02-25 Thread Philip Oakley
On 25/02/13 20:47, Matt Snow wrote: For some unknown reason whenever I do a git pull, it just hangs. Nothing happens. I have tried to remove all the files, do a git init, then try to git pull again but no luck. I am at a loss for what happened or any ideas how to fix it. Anyone care to help a

[git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-01 Thread Philip Oakley
I have two PCs, one running Windows Msysgit Git for Windows, which I'm familiar with, and the other a laptop with Ubuntu (still not familiar). I have a repo hosted on GitHub. I rebased a branch on my windows PC and pushed it to Github with a forced update. I've now fetched the branch to my

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-01 Thread Philip Oakley
From: Philip Oakley philipoak...@iee.org Sent: Friday, March 01, 2013 10:36 PM I have two PCs, one running Windows Msysgit Git for Windows, which I'm familiar with, and the other a laptop with Ubuntu (still not familiar). I have a repo hosted on GitHub. I rebased a branch on my windows PC

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-02 Thread Philip Oakley
On 02/03/13 12:08, Thomas Ferris Nicolaisen wrote: On Saturday, March 2, 2013 12:23:07 AM UTC+1, Philip Oakley wrote: From: Philip Oakley philip...@iee.org javascript: Sent: Friday, March 01, 2013 10:36 PM I have two PCs, one running Windows Msysgit Git for Windows, which I'm

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-03 Thread Philip Oakley
On 03/03/13 11:26, Thomas Ferris Nicolaisen wrote: The confusion there would be public vs private branches (never publish to a public branch that _will_ be used by team mates). But I would still expect that individual developers would need to fixup and rework their private

Re: [git-users] Can I delete origin/HEAD origin/master to start new repo?

2013-03-04 Thread Philip Oakley
One technique, which is a bit of a hack, is to first checkout the branch/commit that you want to be your start point, and then copy the whole directory to a new directory. Then delete the .git subdirectory leaving you with a new clean folder that isn't yet a git repo at all. (or you could do a

Re: [git-users] HELP! stash pop is failing and I can't get my work out

2013-03-09 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net To: git-users@googlegroups.com Sent: Saturday, March 09, 2013 11:02 AM Subject: Re: [git-users] HELP! stash pop is failing and I can't get my work out On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote: [...] i seriously don't

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Philip Oakley
- Original Message - From: Paul Smith To: git-users@googlegroups.com Sent: Monday, March 11, 2013 3:33 PM Subject: [git-users] Reset branch to master after merge I've been searching but I've not found anyone else asking about this. In my workflow I tend to do a bunch of

Re: [git-users] Did I loose my repository?

2013-03-25 Thread Philip Oakley
First, take a copy of the full project directory, including the .git directory. It's worth taking a second copy of the .git directory so you can do investigations on it. Using pro-git or one of the other on-line guides, check the structure of the .git directory. Do you have a HEAD file, do you

Re: [git-users] Reformatting vs. git blame

2013-03-26 Thread Philip Oakley
From: Paul Smith p...@mad-scientist.net To: git-users@googlegroups.com Sent: Tuesday, March 26, 2013 8:23 PM Subject: [git-users] Reformatting vs. git blame Hi all; please don't respond just don't do that, because that's not an option :-). We are reformatting our codebase. Obviously we want

Re: [git-users] Reformatting vs. git blame

2013-03-26 Thread Philip Oakley
From: Paul Smith p...@mad-scientist.net Sent: Tuesday, March 26, 2013 9:11 PM On Tue, 2013-03-26 at 20:46 +, Philip Oakley wrote: We accept that git blame across the reformat will not be useful. I'm going to lay down a label right before the reformat, so people can use that to trace

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-06 Thread Philip Oakley
If I understand correctly, you will need to permit sharing of the two repo folders so that the other PC is allowed to access the folder. So (XP thoughts) in the source PC, right click the repo folder in windows explorer, select sharing, and permit the appropriate User / PC to access the folder

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-06 Thread Philip Oakley
From nothing. Simply start with `git init` on the first PC. (and `git add`; `git commit` etc. so you have something in the repo) Permit sharing. Got to second (or third, 4th, ..) PC, create directory, permit sharing, and then `git clone`. This should populate the directory with the 'copy' of

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-07 Thread Philip Oakley
- From: Leonidas Savvides To: Philip Oakley Sent: Sunday, April 07, 2013 6:43 AM Subject: Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC YES IT HELPS... I CLONE COMMAND should be like this or... git clone User-HP@192.168.10.11:C:/Users/User

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-07 Thread Philip Oakley
management (and wether others have already done the hard work to make it a walled garden). Philip - Original Message - From: Leonidas Savvides To: Philip Oakley Sent: Sunday, April 07, 2013 12:47 PM Subject: Re: [git-users] connectng 2 win PCs in local network - clone folder

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-07 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Sunday, April 07, 2013 5:43 PM On Sun, 7 Apr 2013 11:03:02 +0100 Philip Oakley philipoak...@iee.org wrote: ... uses the windows backslash separator) I use this method with Git Extensions and Git for Windows (msysgit compiled

Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC

2013-04-08 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Monday, April 08, 2013 9:02 AM Oh, come on! I did not even think about anything non-Windows when I was writing my response. No, really ;-) I might appear to be a F/OSS enthusiast (and I am) but at my $dayjob I mostly tame

Re: [git-users] Re: Getting git submodule init to work

2013-04-26 Thread Philip Oakley
- Original Message - From: Thomas Ferris Nicolaisen To: git-users@googlegroups.com Sent: Friday, April 26, 2013 7:22 AM Subject: [git-users] Re: Getting git submodule init to work On Friday, April 26, 2013 4:52:41 AM UTC+2, Dale Worley wrote: OK, how to I set up a

Re: [git-users] How to prevent pulls from wrong repository

2013-04-29 Thread Philip Oakley
From: David Cherian To: git-users@googlegroups.com Sent: Monday, April 29, 2013 5:50 PM Subject: [git-users] How to prevent pulls from wrong repository I have several tool repositories using git, and have several users who can develop on several of these tool repos. What I would

[git-users] Re: How to organise the workflow

2013-05-01 Thread Philip Oakley
On Wednesday, 1 May 2013 14:04:07 UTC+1, And Ro wrote: Hello! I have a bare repository hosting on a local server and a few local clients with working copies of that repository. I was going to a business trip so I had to clone the repository on a new laptop before leaving. But I was in a

[git-users] Re: How to organise the workflow

2013-05-01 Thread Philip Oakley
On Wednesday, 1 May 2013 14:04:07 UTC+1, And Ro wrote: Hello! I have a bare repository hosting on a local server and a few local clients with working copies of that repository. I was going to a business trip so I had to clone the repository on a new laptop before leaving. But I was in

Re: [git-users] Re: 3 servers git workflow help needed: Development-Testing-Production

2013-05-24 Thread Philip Oakley
You can always have a look at how git itself is 'managed' in terms of its branches that Junio (maintainer) integrates. That is, he has lots of sub-branches for each contributer's patch series that are merged into 'pu' (potential updates) at various points (and rewound when they are updated or

Re: [git-users] Re: proper meaning of '.' dot in a git command?

2013-05-25 Thread Philip Oakley
Windows netbook to a hack ubuntu laptop whose graphics chip packs in every month or two) Philip - Original Message - From: Yawar Amin yawar.a...@gmail.com To: git-users@googlegroups.com Cc: Philip Oakley philipoak...@iee.org Sent: Friday, May 24, 2013 1:56 AM Subject: Re: [git-users] Re

Re: [git-users] cannot post to the mailing-list

2013-06-13 Thread Philip Oakley
The vger list refuses all HTML emails. For the git@vger list you will need to change your mail format to plain text. Some mail clients can make this very hard to do, but you should persevere. Part of the issue is that HTML readers can easily propogate spam, phishing and other malware (because

Re: [git-users] Repository arrangements

2013-06-13 Thread Philip Oakley
From: Roddie Grant gitl...@myword.co.uk Sent: Thursday, June 13, 2013 12:11 PM Where there is a small team, say 3 or 4 developers, is it acceptable practice to pull direct from each other's repositories? There is no special restriction on this (pull or fetch) to share branches between each

Re: [git-users] what is the point of rebase?

2013-06-13 Thread Philip Oakley
From: David Gudeman To: git-users@googlegroups.com Sent: Thursday, June 13, 2013 7:12 PM Subject: [git-users] what is the point of rebase? I've been getting to know git recently as part of some work I needed to do, and I love the easy branching and merging, but I have to admit that

Re: [git-users] Best way to identify a version of a repo

2013-06-14 Thread Philip Oakley
From: Deanna Delapasse To: git-users@googlegroups.com Sent: Friday, June 14, 2013 1:08 PM Subject: [git-users] Best way to identify a version of a repo I need to checkout code from a repo and somehow identify it (timestamp, hash, …) such that at some later time I can extract the SAME

Re: [git-users] Best way to identify a version of a repo

2013-06-14 Thread Philip Oakley
] Philip - Original Message - From: Deanna Delapasse To: Philip Oakley Sent: Friday, June 14, 2013 2:23 PM Subject: Re: [git-users] Best way to identify a version of a repo Maybe - I'm very new to this. I'll try it. On Fri, Jun 14, 2013 at 8:05 AM, Philip Oakley philipoak

Re: [git-users] git describe - strange results

2013-06-15 Thread Philip Oakley
From: Kevin Wilson wkev...@gmail.com Sent: Saturday, June 15, 2013 9:29 PM Hello, I am trying git describe --contains 21dc330157454046dd7c494961277d76e1c957fe and I get: v2.6.37-rc1~147^2~717 While the info it returns is correct (this patch was indeed for v2.6.37-rc1), I don't understand the

Re: [git-users] developers docs ?

2013-06-16 Thread Philip Oakley
From: the.u...@gmail.com To: git-users@googlegroups.com Sent: Sunday, June 16, 2013 1:41 PM Subject: [git-users] developers docs ? I am curious to have a look at the source. But since it is a rather big project I wonder is there a guide/walk-through to the structure of the source ?

Re: [git-users] developers docs ?

2013-06-16 Thread Philip Oakley
is a bit longer but also has the obvious #includes to object.h It's a bit like peeling an onion - don't rub your eyes too soon ;-) Philip - Original Message - From: the.u...@gmail.com To: git-users@googlegroups.com Cc: the.u...@gmail.com ; Philip Oakley Sent: Sunday, June 16

Re: [git-users] Re: developers docs ?

2013-06-16 Thread Philip Oakley
raising your voice for having a guide_to_the_source.txt set up - it would help enormously - seeing especially how msysgit lacks commiters On Sunday, June 16, 2013 8:14:35 PM UTC+3, Philip Oakley wrote: The main sub-commands which have beeen coded in c are in the sub-directory 'git/builtin

Re: [git-users] what is the point of rebase?

2013-06-16 Thread Philip Oakley
From: David Gudeman To: git-users@googlegroups.com Cc: Philip Oakley Sent: Sunday, June 16, 2013 11:31 PM Subject: Re: [git-users] what is the point of rebase? Thanks for taking the time for such a detailed reply, Philip, but everything you say seems to be true of merge as well so

Re: [git-users] Re: Humorous description of git

2013-06-17 Thread Philip Oakley
But waht we need is the 'translation' as to why it's true ;) I see that homeomorphic = a one-to-one correspondence, continuous in both directions, between the points of two geometric figures or between two topological spaces. So I think that means if my SHA1 equals your SHA1 we have the same

Re: [git-users] Submodule tracking remote master shows modified on super project git status after submodule update --remote

2013-06-17 Thread Philip Oakley
From: Adam Strzelecki To: git-users@googlegroups.com Sent: Monday, June 17, 2013 5:55 PM Subject: Re: [git-users] Submodule tracking remote master shows modified on super project git status after submodule update --remote Bump, None one knows how to make Git =1.8.2 not show

  1   2   3   4   5   >