Re: Seeing git history of file including merge changes

2015-09-09 Thread Dov Grobgeld
I asked the following question on StackOverflow a while ago, but did not receive any answers so I'll try here. We have git repository where a file was changed on a topic branch and this branch was then merged back into the main branch. Due to various reasons the merge was made wrongly and as a res

Re: Partnership with Git

2017-02-21 Thread Dov Grobgeld
Nikita, As git is free software, you are free to use it in any way you see fit, as long as you adhere to its licensing terms, and to the copyright restrictions on using the term "git". Thus there is no need to ask permission and there does not on the git side exist any entity interested in "cross

Re: Bug report

2017-08-31 Thread Dov Grobgeld
The following answer that I got back in 2015 from Jeff King might be relevant to your problem: https://marc.info/?l=git&m=144178948506788&w=2 Regards, Dov On Thu, Aug 31, 2017 at 9:36 AM, Kevin Daudt wrote: > On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote: >> I have a file >>

Re: A basic question

2012-10-11 Thread Dov Grobgeld
The way you typically work with git (and with most other version control systems) is that you have a fast changing trunk (in git often called the master), where development is done. Once you want to release you create a release branch off the trunk, and in that branch you do regression testing and