That's there [1], it's not the git default because in git we're soppose to
work on branches for features and "more than one commit" bug fixes, then
merge without rebasing allows the history to keep track of this set of
changes, it creates a merge commit.
What you did is only do few commits as part of a bugfix, but because you
wasn't working on a branch, when you did git pull, internaly, git did a git
fetch and then a git merge and because I modified files in between, no fast
forward was possible, so, it let you commits before mine, instead, with the
command I gave you, the git pull does a git fetch and than a git rebase with
rewrite the commits history to place your commits after mine.
If you look at the history, you can see that your commits has been placed
before mines even though I pushed before and the first line is the merge
commit, the reason why it touched the README I committed.
* 4f6c47d Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
|\
| * b5fce93 FLEX-33435 added more details
| * 9c7c97e Updated for the Svn to Git migration
* | 85af480 Added el_GR locale for postcodes
* | 63580a8 Adding more datagrid double click modes
|/
* c5869e4 Added nl_NL locale for postcode validator
* cbfeae5 Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
|\
| * 5e15ba8 OS X specific entry for flex-tlf link
* | f825b4a Added fi_FI locale for postcode validator
|/
* 35c5fbd Added ru_RU locale for postcode validator
* fc57407 Added pt_PT postcode validator strings
* 8645f87 Added pt_BR postcode validator strings
* 2d41d85 Added ja_JP postcode validator strings
* 8b9c4a6 Added de_DE postcode validator strings
-Fred
[1] https://git-wip-us.apache.org/docs/committer-practices.html
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Tuesday, March 19, 2013 2:06 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
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: dev@flex.apache.org
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, jmcl...@apache.org 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 <jmcl...@apache.org>
Authored: Tue Mar 19 23:34:02 2013 +1100
Committer: Justin Mclean <jmcl...@apache.org>
Committed: Tue Mar 19 23:34:02 2013 +1100
----------------------------------------------------------------------
README | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
