Re: [git-users] How to handle a longrunning branch

On Tue, 17 Nov 2015 23:47:13 -0800 (PST) mike wrote: > > > I have had a branch, feature_xyz, for a long time ( yes I know I > > > should not but it was not my call). Problem is I have not updated > > > it with changes from master. So I started to do a regular rebase

[git-users] Separate large git project

Hello! I would like to separate a git project into smaller repositories: > Core + subproject1 > Core + subproject 2 >... Core being in its own repository and i would like it to not get any bigger. Each subprojects would have their own repo and cant include Core cause they are already big

Re: [git-users] How to handle a longrunning branch

Hi, There is no way around resolving the conflicts if you want to keep your history. But there are strategies that can simplify the process. To decrease the number of conflicts you need to resolve, you can first interactively rebase your branch and "squash" successive commits. This means you

Re: [git-users] contaminated git log

On Tue, Nov 17, 2015 at 06:35:19AM -0800, Daniel Doron wrote: > Thanks Konstantin, that is very thorough information. > I will find the time and formulate a request to Git developers. Yes, please do. As you understood already I got bitten by exactly that issue when looking at your logs. I've

Re: [git-users] How to handle a longrunning branch

On Tue, Nov 17, 2015 at 10:02:03AM -0800, mike wrote: > Hi, > > I have had a branch, feature_xyz, for a long time ( yes I know I should not > but it was not my call). Problem is I have not updated it with changes from > master. So I started to do a regular rebase ( i want to keep history): > >

[git-users] opengrok for git branches

Hi, I have set up opengrok[https://github.com/OpenGrok/OpenGrok] for git repos. By default, opengrok index current checked out branch. I want it to index on all branches. I did some search and got to know that I have to clone every branch in separate directory and ask opengrok to index all