Hi all just finish update upstream backfire branch, now we have some new feature like: include/nls.mk, include/cmake.mk
rebase on top of svn://svn.openwrt.org/openwrt/branches/backfire@25455 you can find them at http://projects.qi-hardware.com/index.php/p/openwrt-xburst/source/commit/6d44b9f9983a1bf2015de87ccdf2e5769fdf3449/ NOTICE: after rebase, we have to run 'git push -f' for update the git server after do that, the git history is changed, we can run those steps for update local repo 1. backup you work not in openwrt-xburst.git server, if not commit backup by 'git stash' restore them by 'git stash pop' if something already commit, backup by 'git format-patch -N' N means the commit count restore them by "git am ...." 2. git fetch -a 3. git reset --hard origin/master (make sure you are in correct local 'master' branch) 4. restore you backup work here is the step I do git rebase, 1. checkout openwrt-xburst.git git clone git://projects.qi-hardware.com/openwrt-xburst.git 2. add new remote for upstream backfire, we name it 'backfire' git remote add backfire git://nbd.name/backfire.git 3. fetch all files git fetch -a 4. checkout a new local branch for backifre, we name it 'backfire' git checkout -b backfire backfire/master 5. before we do rebase, we always upload local repo git checkout backfire; git pull git checkout master; git pull 6. then at 'master' branch run git rebase backfire 7. if there is conflicts, we you using GUI merge tool for resolve the conflicts git mergetool (I always using 'meld') after fix conflicts run git rebase --contine 8. if you want skip some commit, or merge two commit to one. we can using git rebase -i backfire (will create a wiki page tomorrow) the config of my local git repo: $ git config -l .... [email protected]:openwrt-xburst.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.upstream.url=git://nbd.name/openwrt.git remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/* remote.backfire.url=git://nbd.name/backfire.git remote.backfire.fetch=+refs/heads/*:refs/remotes/backfire/* branch.backfire.remote=backfire branch.backfire.merge=refs/heads/master branch.upstream.remote=upstream branch.upstream.merge=refs/heads/master branch.history.remote=origin branch.history.merge=refs/heads/history branch.master.remote=origin branch.master.merge=refs/heads/master _______________________________________________ Qi Hardware Discussion List Mail to list (members only): [email protected] Subscribe or Unsubscribe: http://lists.en.qi-hardware.com/mailman/listinfo/discussion
