I followed the steps here:
http://openocd.sourceforge.net/doc/doxygen/html/index.html and successfully
created and submitted a patch. That patch has now been committed to the code,
so what I'd like to do is to bring my local copy up to date with the online
version. I attempted it via this sequence:
git pull --rebase origin master
(this reported a merge problem with an experimental change I had made to one of
the committed files)
git rebase --skip
git pull --rebase origin master
git pull origin master
I *think* I now have the latest code but when I just say "git pull", git
reports that I'm not on a branch. Also "git reflog" says:
b2dc1af HEAD@{0}: pull origin master: Fast-forward
3f9f7de HEAD@{1}: pull --rebase origin master: checkout
3f9f7de7b0dc57e435d90ebde2bccf31bf4f0270
f2cdf70 HEAD@{2}: commit (amend): em357: added target files for em357 and em358
5452504 HEAD@{3}: checkout: moving from master to FETCH_HEAD
1663a17 HEAD@{4}: clone: from http://git.code.sf.net/p/openocd/code
I use svn rather than git daily, and haven't been able to figure out from
looking on line how I get back to just a plain clone, short of blowing away the
entire tree and cloning it again. That doesn't seem very reasonable, so what am
I doing wrong? Or is it fine and I just (still) don't understand git at all.
Ed
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
