Skip to content

MichalMaruska/git-hierarchy

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Sample session:

you somehow have "master" to point at some base upstream commit.

$ git-segment bgnone master

will create branch-segment "bgnone". You can see with gitk(1), that 2 references accompany this: start & base.

"start" is pointing at the commit, which is now current at "master", "base" is pointing at the head "master".

That means, that when we "git pull", and "master" will move to follow upstream, "base" will move along with "master", but "start" will remain.

Then commit something on bgnone.

Create another segment:

$ git-segment misc master

... commit something on misc

Now, create a sum of the 2 segments. For example you want to make a feature branch which relies on the 2 features. Or just to build the SW.

$ git-sum all  bgnone misc

issues:

git show-ref --hash $base only if $base is full -- unique! otherwise expands to all refs & dumps all of them.

About

keep a poset of feature segments & sums, with rebasing

Resources

Stars

Watchers

Forks

Packages

No packages published

Languages