Hi, On Tue, 19 Dec 2006, Jakub Narebski wrote: > SungHyun Nam wrote: > > > I'm sorry... but could you teach me how I publish the rebased branch? > > I think Junio does it for 'pu' branch. > > Is there recommended workflow? I cannot find. > > Either have "Push:+refs/heads/br:refs/heads/br" in your > .git/remotes/<name> file, or it's equivalent config file > version, with '+' denoting that this branch sometimes does > not fast-forward. > > Or use git push with --force option when you had rebased. > > And of course the server you push to has to not have config variable > receive.denyNonFastForwards set to true. If that is the case, there is a work-around, which happens to be also nice to tracking parties: $ git pull -s ours <remote> <branch> $ git push <remote> <branch> The disadvantage (which I'd argue is actually an advantage) is that you do not lose history. After all: "those who do not learn from history are doomed to repeat it". Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html