Re: [Jack-Devel] [PATCH 0/1] jackd1+jackd2: Small typo

Prev	Next Index
Date	Fri, 29 Jul 2011 16:27:14 +0200
From	Adrian Knoth <[hidden] at drcomp dot erfurt dot thur dot de>
To	[hidden] at lists dot jackaudio dot org

On Fri, Jul 29, 2011 at 01:25:12PM +0300, Nedko Arnaudov wrote:

> > The following patch needs to be applied to both, jackd1 and jackd2. For
> > jackd2, it's already in the mob branch on repo.or.cz, so somebody there
> > could in theory do a "git merge mob" to the master branch.

> Please next time, don't merge master into mob. Rebase instead,
> in your case it would even have be a fast forward, because you merged
> before comitting and there were no commits in the mob branch that
> were not in master as well.

You're sure this works? Last time I rebased a published branch and
pushed the results, it made commits show up multiple times with new
SHAs. Which more or less makes sense, since rebase changes commits.

Here:

   http://repo.or.cz/w/ffado.git/shortlog/refs/heads/debug-cleanup

Four times "LIBRAW1394". Given that a rebase changes the starting point
in history, everyone who has the mob branch would need to change it,
too.

I read a bit on the Internet the other day:

   https://git.wiki.kernel.org/index.php/GitFaq#Why_won.27t_.22git_push.22_work_after_I_rebase_a_branch.3F

But maybe I miss something?

Cheers

-- 
mail: [hidden]  	http://adi.thur.de	PGP/GPG: key via keyserver

Prev	Next Index

1311949653.32398_0.ltw:2,a <20110729142714.GT19500 at ltw dot loris dot tv>