On Sat, Oct 4, 2008 at 10:20 PM, Ramesh <rramesh1@xxxxxxxxx> wrote: > Hello, > > I am newbie to linux-wireless, I recently got a copy of the source > from the wireless-testing branch by the following method: > > git-clone git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git > cd wireless-testing > git-pull > > I wanted to work on my own branch so I created a new branch as below: > > git-checkout -b mac80211-stats-change > > I have a few questions at this point : > > How do I keep this branch updated with checkins in the master branch? > > Thanks > Ramesh > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > You need to periodically rebase the branch using git-rebase. Alternatively, you can do this sequence: -Revert all changes you made to the branch -Pull the latest upstream changes using git-pull git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git -Reapply your changes. -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
