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

2013-03-08 Thread Johan 't Hart
On Tuesday, January 15, 2013 11:48:33 PM UTC+1, Carsten wrote: > >> My guess is that it has just always behaved that way, and changing it now > would surprise too many users. Personally I would find it very disturbing > if "merge" started modifying my index (the only commands that should modify

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

2013-03-08 Thread Johan 't Hart
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 al

Re: [git-users] from the commit message to get its in which branch or tag

2013-03-17 Thread Johan 't Hart
Wasnt there something like patch-id you can use in this case? Is there a way to search a branch for a commit with a certain patch id? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving email

Re: [git-users] from the commit message to get its in which branch or tag

2013-03-18 Thread Johan 't Hart
On Monday, March 18, 2013 4:40:55 PM UTC+1, lei yang wrote: > > > > On Mon, Mar 18, 2013 at 6:03 AM, Johan 't Hart > > wrote: > >> Wasnt there something like patch-id you can use in this case? >> > > > > Is there a way to search a branch for a

[git-users] Re: Do commits remember branch names?

2013-03-21 Thread Johan 't Hart
On Thursday, March 21, 2013 8:48:59 PM UTC+1, Brian Jones wrote: > > In out of the box git, do commits remember the name of the branch that > created them? If so, what command can I use to see that information? My > assumption is that commits do not record branch names but I want > confirmatio

[git-users] Re: How to prevent git repo to get big file history back

2013-03-21 Thread Johan 't Hart
On Wednesday, March 20, 2013 7:34:18 PM UTC+1, Ashutosh Kumar wrote: > > Hi, > > I am working on removing big file from my git repo and its history as > well. But i am facing one issue .. > > here is my scenario > > 1. Create a repo > 2. Commit and push a big file > 3. Clone the repo in to test_

[git-users] Re: How to prevent git repo to get big file history back

2013-03-21 Thread Johan 't Hart
Another way you might have a chance of getting rid of the big file: - Do a filter-branch (to get rid of big file) - Create a helper branch - Reset it to the place where the big file was first committed (I mean, not before that commit, but right on it) - Now create a dummy empty file with the same

[git-users] Re: Two strategies for a new project.

2013-03-26 Thread Johan 't Hart
For me its not really clear whether your developers work on a project and do changes on the SDK from the chip guys, or the project is purely (extensive) modifications to the SDK? In both cases, I think you can do both the options you proposed like this: Create a git repository that has 2 submodu

Re: [git-users] Re: Using Git to track system file customizations

2013-04-03 Thread Johan 't Hart
On Tuesday, April 2, 2013 8:42:28 PM UTC+2, Dale Worley wrote: > > Those look way too heavy-weight for me. I just need a tool that keeps > track of the deltas to files that are due to my intervention vs. the > deltas to the files that are due to the distributed version of the > software. > >

[git-users] cherry-picking modifies more than it should

2013-10-21 Thread Johan 't Hart
You did git cherry-pick HEAD..A Instead of git cherry-pick A ? Or maybe the wrongly introduced code is around the conflict you resolved? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving e