Print

---

Hi

I’ve merged master on to demo-devel to avoid confusion. There was a (trivial) conflict in cGadgetron/Makefile (using g++ as opposed to /usr/bin/g++). This incorporated changes by Evgueni to 2 demos (adding return values to tests).

Git commands used:
git fetch
git checkout demo-devel
git merge master
# edit cGadgetron/Makefile to resolve conflict
git add cGadgetron/Makefile
git commit -m "merged master to demo-devel resolving cGadgetron/Makefile conflict"
git push

probably best if you “git checkout demo-devel;git pull” now.

If you want to check on github what changes have been made, see
https://help.github.com/articles/comparing-commits-across-time/

Some other useful git commands:

# git a list of changes to a particular file
git log README.txt
# changes on all branches
git log --all README.txt
# find differences between your current file and the version on another branch
git diff master -- coil_sensitivity_maps.py
# or you can use a SHA1 the git log
git diff 0a03803c690e8d4 -- coil_sensitivity_maps.py

# just show a file at a particular revision to stdout
git show master:cGadgetron/Makefile
# see what it is remotely
git fetch
git show origin/master:cGadgetron/Makefile
# put a particular revision in a new file, for checking
git fetch
git show origin/master:cGadgetron/Makefile > the-master-version-of-Makefile


there’s obviously a lot more, but hopefully this helps

Kris