[git-users] Amending a commit into different branches

2012-06-19 Thread TIm Chase
In playing around on scenarios in which I often find myself, I have the following repo: master dev | | v v A --- B --- C In an ideal world, the commit path would have had parts of the C commit split into several bugfix branches instead of directly committing on dev,

[git-users] Re: Amending a commit into different branches

2012-06-19 Thread TIm Chase
On 06/19/12 07:52, Thomas Ferris Nicolaisen wrote: I took the liberty of monospacing your ascii-art below: master dev | | v v A --- B --- C Not sure what happened there...according to my Sent folder, they went out from Thunderbird on my end as

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

2012-06-28 Thread Tim Chase
On 06/28/12 12:57, Nicolas Bock wrote: I checked out the most recent version from CVS and made that the initial commit of our git repository. This unfortunately meant that we lost all history prior to the switch. We would now like to add that missing history into git. I converted the CVS to

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

2012-06-28 Thread Tim Chase
On 06/28/12 13:44, Philip Oakley wrote: You can use Grafts Always happy to learn new git tricks. Thanks! This is a far better solution than my rebasing, though with similar (albeit easier and cleaner) results if you plan to push anywhere. From what I read, the grafting doesn't get pushed, so

[git-users] Marking code blocks consistently ignored for add/commit

2012-07-06 Thread Tim Chase
I've got a number of Python modules where the debugging code changes on a regular basis, but is of no relevance to the history of the file. For a snippet, it might be something like def real_code(x): return do_stuff(x) # version everything above the next

[git-users] Re: Marking code blocks consistently ignored for add/commit

2012-07-08 Thread Tim Chase
On 07/08/12 11:13, Lars Pensjö wrote: I think this is a common problem. You have changes in the code that you do not want to check in. I use git gui for this. It is easy to select what hunks, or even individual lines, that shall be included in the index. As mentioned, I currently just use

[git-users] Re: Creating an initial git repository

2012-07-19 Thread Tim Chase
On 07/19/12 06:54, P Rouleau wrote: I suggest to read http://hginit.org that URL was failing for me. I presume you mean http://hginit.com -tkc -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to

[git-users] Re: Bug? status --porcelain only quotes spaces in added files

2012-07-24 Thread Tim Chase
On 07/24/12 12:07, Graham Jans wrote: On Tuesday, 24 July 2012 04:37:47 UTC-7, Tim Chase wrote: $ touch a 1.txt $ touch a 2.txt $ touch 'a 3.txt' $ git add a 1.txt $ git status --porcelain A a 1.txt ?? \a 3.txt\ ?? a 2.txt

Re: [git-users] misleading diff hunk-header

2012-08-21 Thread Tim Chase
On 08/21/12 07:19, Konstantin Khomoutov wrote: On Mon, 20 Aug 2012 20:49:48 -0500 Tim Chase g...@tim.thechases.com wrote: tl;dr version: diff.{type}.xfuncname starts searching backwards in from the beginning of the hunk, not the first differing line. This list is for helping inexperienced

[git-users] Re: how to to check if a branch has changes not present in master?

2012-08-28 Thread Tim Chase
On 08/28/12 03:13, Fred wrote: is there a way to check if a branch doesn't introduce changes, which are not in master. I'm partial to git diff my_branch ^master which would find all the changes on my_branch that aren't yet on master. This is an open syntax so you can request changes that

[git-users] Re: how to to check if a branch has changes not present in master?

2012-08-28 Thread Tim Chase
On 08/28/12 05:47, Tim Chase wrote: On 08/28/12 03:13, Fred wrote: is there a way to check if a branch doesn't introduce changes, which are not in master. I'm partial to git diff my_branch ^master which would find all the changes on my_branch that aren't yet on master

[git-users] More details on merge-driver=union

2012-10-18 Thread Tim Chase
I've read the somewhat sparse documentation in gitattributes(5) on the union merge driver, but on #git I was cautioned that there may be unexpected behaviors. My use-case is to consolidate (usually[*]) append-only mbox files that might conflict when different messages are added within various

[git-users] Re: Why do I have to be a source control engineer just to be a software developer?

2012-10-30 Thread Tim Chase
On 10/29/12 17:31, kramer.newsreader wrote: I am a fairly experienced developer and I have never had issues working with source control tools before git. I take a new job. I am working with git. I am thinking about quitting over having to use it. I'll admit that I too took about 4 or 5

[git-users] Re: is it possible to make ``git add --patch`` use arbitrary diffs?

2012-11-02 Thread Tim Chase
On 11/02/12 10:15, Andrej wrote: ``git add -p`` allows to interactively decide what is to be staged. It shows hunks of code to you much like ``git diff`` would do. The question is: is it possible somehow to interactively stage arbitrary differences other than diffs between working tree and

[git-users] Re: /opt/git folder

2012-11-22 Thread Tim Chase
On 11/22/12 06:28, Konstantin Khomoutov wrote: So, to answer the original question, Git *might* be installed under /opt, when doing manual compilation, but this is somewhat odd due to a number of reasons--it's always better to first try installing Git from a ready-made binary package. Every

[git-users] Re: GIT actions from bugzilla server to origin

2012-12-05 Thread Tim Chase
On 12/05/12 05:37, Konstantin Khomoutov wrote: On Tue, 4 Dec 2012 10:43:32 -0800 (PST) Jeffrey Marans jmarans-re5jqeeqqe8avxtiumw...@public.gmane.org wrote: I'm working on transitioning about 15 CVS modules to GIT repositories and I think I've got a handle on how to translate the cvs

[git-users] Re: git - svn migration question

2012-12-20 Thread Tim Chase
On 12/20/12 02:22, Thomas Ferris Nicolaisen wrote: On Thursday, December 20, 2012 5:35:56 AM UTC+1, Daniel Pomerantz wrote: git svn clone svn_url --authors-file=users.txt --no-metadata -s Git_Repo_Name Any reason why you are not using the --stdlayout argument? This is key for converting a

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

2013-01-14 Thread Tim Chase
I was playing around with some of the information that rev-parse can return and just tried --is-inside-work-tree to see what it would return. As expected, in my working-dir $PROJ, it returns true. Same for within $PROJ/.git and $PROJ/dir_with_nothing_tracked However, when I try git rev-parse

[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