On 03/02/2011 07:34 AM, Kamil Paral wrote:
----- Original Message -----
> As the resident git noob, I managed to undo part of one of kparal's
> commits in the pytest branch.
>
> Note: This does not affect master or any other branches
>
> I think that I know what happend but I'm still working out the how,
> why
> and how to fix. Fortunately, I just un-renamed some variables so if
> all
> else fails I can just re-rename those variables by hand.
>
> Just figured that I would say something in case somebody noticed. I'm
> in
> the process of learning how to fix it and trying to resist the urge to
> q-n-d rename by hand. I'm prioritizing this under the assumption that
> nobody else would be affected if it takes me a little while so please
> correct me if I'm wrong.
>
No worries, Tim. You can do whatever you like in your branch. When you believe you have
something ready for showtime, just tell us and we'll look at it, that's all :-)
If you want to compare the differences between your branch and master, just do
$ git diff origin/master..pytest --name-status
and you'll see whether you made changes to some files you didn't intend to.
Also, I like the 'gitg' tool.
Thanks for the pointers on commands and tools, I appreciate it.
I couldn't quite figure out how to revert partial commits after pushing
so I just repaired the unwanted changes. I'll just have to be more
careful about merges in the future.
Tim