yeah, you shoud run this[1] once to allow automatic rebasing on merge which
I referenced here [2] as Suggested pratices, that what I was talking about
yesterday about messing the history.
-Fred
[1] git config --global branch.autosetuprebase always
[2] http://flex.apache.org/dev-sourcecode.html
-----Message d'origine-----
From: Justin Mclean
Sent: Tuesday, March 19, 2013 1:50 PM
To: [email protected]
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
Very odd as I've made no changes to README - any idea what''s happen here?
Justin
On 19/03/2013, at 11:37 PM, [email protected] wrote:
Updated Branches:
refs/heads/develop b5fce9368 -> 4f6c47d2e
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4f6c47d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4f6c47d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4f6c47d2
Branch: refs/heads/develop
Commit: 4f6c47d2e927860d914a96771b7bffe706e8fff1
Parents: 85af480 b5fce93
Author: Justin Mclean <[email protected]>
Authored: Tue Mar 19 23:34:02 2013 +1100
Committer: Justin Mclean <[email protected]>
Committed: Tue Mar 19 23:34:02 2013 +1100
----------------------------------------------------------------------
README | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
