Reviewing merge request #1: Silly changes
You probably shouldn't merge this as there aren't any notable improvements.
- Requested by:
Jason Kridner - Status: Open
- Source repository: jadon-angstrom-setup-scripts:jadon
- Target repository: angstrom-setup-scripts:master
- Created at: March 9th, 2010 21:28
Commits that would be merged:
- f984361
- 354d045
- 71268f2
- ec105fb
- 3bd2a51
- d8fc0f3
- c038515
- 667c254
Trying to make things work on TI nemo build machine.
Trying to figure out how to get git-proxy to not use corkscrew when it doesn't exist, but I don't have it working yet.
Fix spelling issue.
Added aliases for the proper board names.
If the vm file doesn't exist, don't touch it!
Just trying to make it a bit simpler.
oebb.sh: since 44ecf674747fef9f71f928660b394ca470a135fc OE doesn't need the mmap hack anymore
f984361-354d045Comments
Now I know what a ‘merge request’ looks like :) I expected a “merge me” button, but there isn’t, not even a hint on how to merge using the cmdline :(
Wait, there’s a “How to apply this merge request to your repository” box at the far bottom of this page :)
One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.
Check out a new branch for integration
git checkout -b integration
Fetch the merge request into this branch
git pull <br/> git://gitorious.org/angstrom/angstrom-setup-scripts.git <br/> refs/merge-requests/1
Show the commits, assess they are okay
git log —pretty=oneline —abbrev-commit master..integration
To apply the changes to your master branch:
git checkout master
git merge integration
git push origin master
Add a new comment:
Login or create an account to post a comment