Le 03/10/2012 13:48, Erich Titl a écrit : Hi everybody
Just to be inline with current settings I did what I had to do to build my initrd files, committed it to my branch forked off of master v4.3 So master should be untouched and clean [1]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git add repo/busybox/.config [2]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git commit Created commit 9b048d4: enabled nameif applet 1 files changed, 2 insertions(+), 2 deletions(-) [3]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git log [4]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> [5]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> [6]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> [7]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout master Checking out files: 100% (964/964), done. Switched to branch "master" [8]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch * master my_maint So far so good [9]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch --track origin/maint Branch origin/maint set up to track local branch refs/heads/master. [10]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch * master my_maint origin/maint I believe this is not what is meant to be, so I deleted it again [11]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch -a * master my_maint origin/HEAD origin/andrew/remove-mawk-dependencies origin/andrew/zram-support origin/maint origin/maint-4.0 origin/maint-4.2 origin/master origin/next origin/pu origin/ybl/modules-OO Aaaahhhh... this is more to my liking at least I can see now all the remote branches. [12]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout -b maint origin/maint Branch maint set up to track remote branch refs/remotes/origin/maint. Switched to a new branch "maint" [13]mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch * maint master my_maint Now this is more like it, and git tag shows the same stuff as master (with some extensions) Now I shoud be able to branch off this maint branch at level 4.3 but that is not really necessary. @Yves: Is it safe to just merge my chances in my_maint into maint? If not, I can just branch off again and them merge my changes. Hi Erich, to be sure do rebase: git checkout nameif git rebase maint You must not have any conflict After that do a: git diff maint and see what you have changed, and what will be merged If it's okay, return to maint and merge your nameif branch: git checkout maint git merge nameif Then you can push your changes to the public repository with: git pull If you aren't sure if your branch can be merge, you can push your nameif branch to the public repository so we can check it: git checkout nameif git push --set-upstream origin nameif:erich/nameif Regards, Yves Thanks Erich ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! [14]http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ leaf-devel mailing list [15]leaf-devel@lists.sourceforge.net [16]https://lists.sourceforge.net/lists/listinfo/leaf-devel References 1. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 2. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 3. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 4. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 5. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 6. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 7. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 8. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 9. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 10. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 11. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 12. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 13. mailto:mega@luna:~/leaf/devel/leaf.new/bering-uclibc 14. http://p.sf.net/sfu/newrelic-dev2dev 15. mailto:leaf-devel@lists.sourceforge.net 16. https://lists.sourceforge.net/lists/listinfo/leaf-devel ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
