Hi Daniel, depends on the application. If I always rebase my branch, I will never be able to properly publish it, because it has a constantly changing history!
(Each of "my" commits will be rewritten by the rebase whenever a fresh commit
from Denis comes along...)
So for me I'd prefer merging Denis' commits into my branch... However, I see
the point that the rebasing makes sure the local patches always apply cleanly
to Denis' HEAD.
Cheers,
Andreas
# switch to master
git checkout master
# pull Denis' branch from sourceforge
git pull
# switch to Gentoo branch
git checkout gentoo
# merge in Denis' new commits
git merge master
# (with appropriate setup) push both branches to gitorious
git push
My xournal/.git/config:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://xournal.git.sourceforge.net/gitroot/xournal/xournal
[branch "master"]
remote = origin
merge = refs/heads/master
[remote "gitorious"]
url = [email protected]:gentoo-stuff/xournal-gentoo.git
fetch = +refs/heads/*:refs/remotes/gitorious/*
[branch "gentoo"]
remote = gitorious
merge = refs/heads/gentoo
--
Dr. Andreas K. Huettel
Institute for Experimental and Applied Physics
University of Regensburg
D-93040 Regensburg
Germany
tel. +49 151 241 67748 (mobile)
e-mail [email protected]
http://www.akhuettel.de/research/
http://www.physik.uni-r.de/forschung/huettel/
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Xournal-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xournal-devel
