Richard Heck <[email protected]> writes: | On 03/19/2012 06:04 PM, [email protected] wrote: >> Author: Richard Heck<[email protected]> >> Date: Tue, 13 Mar 2012 12:08:25 -0400 >> New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306 >> URL: >> http://git.lyx.org/?p=lyx.git;a=commit;h=0a0a837b70a8e4736b6b848060b6a893a8578306 >> >> Log: >> Address bug 7975 by changing how toggling works, as suggested by >> JMarc. >> | Can someone please check this commit? I was trying to follow the | suggestions given | by Lars about how to handle personal repos, etc, but it looks as if I | got some weird | merge commit along the way. I'm not sure why. Maybe I didn't quite | have that branch | up to date. I'm not sure.
One super trick is to use "gitk --all" to view what your repo and branches look like, or just "gitk" to view a single branch and see how the different paths of development ends up fitting together. As to your change. The merge node is really strange. Did you remove the suggested text from the merge? Use '-m'? -- Lgb
