Adding new roots in git (dropping history)

Question

Possible Duplicate:
In git, is there a simple way of introducing an unrelated branch to a repository?

Let's say that I have two git branches. One with stable app (master) and one with new features (dev). Assume I want to drop history. However I would like to keep relation between master and dev, so that new git tree would be one commit with old master and one with dev changes.

score 2 · Accepted Answer · answered Oct 23 '11 at 23:05

2

Does git checkout --orphan suit your purposes?

answered Oct 23 '11 at 23:05

Amber

507,862
82
626
550

It seems that git 1.7.1 that I'm forced to use doesn't support this feature. Relevant: http://stackoverflow.com/questions/5689960/how-do-i-create-a-commit-without-a-parent-in-git – user986654 Oct 23 '11 at 23:09
Well, that question also provides a workaround. – Amber Oct 23 '11 at 23:10
OK, so last question. How can I make this new branch new master? (so that master would link to new master, and dev would link to new dev) – user986654 Oct 23 '11 at 23:15
`git branch -f master` will force master to the current commit. – Amber Oct 23 '11 at 23:27
Will that also update origin/ branches? – user986654 Oct 23 '11 at 23:34
You'll need to use `git push` to update the remote branches. – Amber Oct 23 '11 at 23:35
It seems that I can't: _To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the_ – user986654 Oct 24 '11 at 00:21
Use `git push --force origin master` to force the update. – Amber Oct 24 '11 at 01:02

Adding new roots in git (dropping history)

1 Answers1