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

mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git add repo/busybox/.config
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git commit
Created commit 9b048d4: enabled nameif applet
 1 files changed, 2 insertions(+), 2 deletions(-)
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git log
mega@luna:~/leaf/devel/leaf.new/bering-uclibc>
mega@luna:~/leaf/devel/leaf.new/bering-uclibc>
mega@luna:~/leaf/devel/leaf.new/bering-uclibc>
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout master
Checking out files: 100% (964/964), done.
Switched to branch "master"
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch
* master
  my_maint

So far so good

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.
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

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.

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"
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.

Thanks

Erich



Attachment: smime.p7s
Description: S/MIME Kryptografische Unterschrift

------------------------------------------------------------------------------
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

Reply via email to