Michael Trensch wrote: > I thought I had the Line-ending stuff in place: > core.autocrlf=false > core.safecrlf=true
Ok, should not do conversion then. > Probably it was an error to keep two branches and merge them by hand. > > I've made the changes in a temporary test environment and tried to merge > the stuff. > 1. cloned openocd's GIT repo > 2. git mv tcl/target/netx500.cfg tcl/target/hilscher_netx500.cfg > 3. Copied hilscher_netx500.cfg from temp > 4. git add tcl/target/hilscher_netx500.cfg > 5. git commit > > Probably i shouldn't have added the file again after modification, > or don't copy it? The above looks exactly right. But you could do one thing to get some more information: After 3. instead of git add you could do git commit. Then copy the file in, and do a git diff, to see the changes that git detects. When pleased, git add and git commit again. Now you have two commits and would like to combine them. Do interactive rebase. git rebase -i HEAD^^ Editor opens with two lines of pick <commit>. Change the second pick to the word squash, then save and exit. git will then combine the second commit with the first in your repo. Then run git commit --amend if you want to fix up the commit message before sending out a patch. (Can also use git send-email to send the patch directly.) //Peter _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
