On Sun, Nov 25, 2012 at 7:53 AM, Per Inge Mathisen <[email protected]> wrote:
>   Commit: 740bf26effe79199dec2507b886611207f376962
>       
> https://github.com/Warzone2100/warzone2100/commit/740bf26effe79199dec2507b886611207f376962
>   Author: Per Inge Mathisen <[email protected]>
>   Date:   2012-11-25 (Sun, 25 Nov 2012)
>
>   Changed paths:
>     M macosx/configs/mkdmgs.sh
>
>   Log Message:
>   -----------
>   Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes
>

How did you manage to do that ?
I assume you didn't rebase before the push, as in, you did git pull
... work on something, git pull again (you got updates), then git push
?

------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Warzone2100-project mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-project

Reply via email to