> Le 8 janv. 2015 à 11:53, Erich Titl <erich.t...@think.ch> a écrit : > > Am 08.01.2015 um 10:57 schrieb Yves Blusseau: >> >>> Le 8 janv. 2015 à 09:53, Erich Titl <erich.t...@think.ch> a écrit : >>> >>> Salut Yves >>> >>> Am 08.01.2015 um 08:46 schrieb Yves Blusseau: >>>> One more thing, was is the branch ‘config’ for ? >>>> If it’s a feature branch it need to be more descriptive. If it’s a branch >>>> that is own by someone else it’s better to name it name-branch. >>> >>> I don't like the fact that leaf has only this old fashoned way of being >>> configured. I created the config branch to to adress a few things not >>> everybody saw necessary to be tackled. Like for any project some small >>> profit always emerges as a side effect. >>> >>> Renaming config IMHO is about as meaningful as renaming master or maint, >>> both these names are as arbitrary as any other, but again, opinions may >>> differ. If there is a way to give config a meaningful name without too >>> much trouble I could not care less. >> >> Ok erich, no problem about the name of the ‘config’ branch. So now what is >> your problem with git ? > > Not really a problem, we are looking for the easiest way to port two > changes to maint, namely > > commit 3ab39e8b8c7fc5635563010f29dd7b9e9ef9cbde > Author: Erich Titl <erich.t...@think.ch> > Date: Tue Dec 9 12:24:44 2014 +0100 > > added libnl3 to wpasuppicant dependencies > > commit f65c46f40394e23fc00c8d36d6cb37831706efc0 > Author: Erich Titl <erich.t...@think.ch> > Date: Mon Dec 8 20:59:28 2014 +0100 > > Added NL80211 driver to wpasupplicant > > I don't know how to move these from the commit branch to maint branch > without messing it up. I could, of course, just redo them in maint. >
The best is to create another (temporary) branch that is a copy of the ‘config’ branch: git checkout -b tmp config Then do a rebase and trash all the commits that you doesn’t want to merge: git rebase -i maint Then merge the commit into ‘maint’: git checkout maint git pull —rebase git merge tmp You can then trash the tmp branch: git branch -d tmp You can then rebase the ‘config’ branch from maint so the commits that has been merge into maint will be automatically remove: git checkout config git rebase maint > BTW. what is the best practice to keep a branch in sync, rebase locally > first, then push? Yes, for a topic branch a rebase is often better. So a git pull —rebase is often the right command. Regards, Yves ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
