Skip to content

Merge the LokeyCoding/magento-mirror repo in to provide history back to CE 1.1.1 #14

Merged
merged 69 commits into from May 17, 2012

1 participant

@LeeSaferite

Merge in the repo from https://github.com/LokeyCoding/magento-mirror to provide long term history back to 1.1.1

This can allow diffs of code for debug purposes and makes the process of merging in new releases easier.

Magento Mirror and others added some commits Jan 17, 2009
Magento Mirror Import Magento Release 1.1.1 d19f0e1
Magento Mirror Import Magento Release 1.1.2 2815710
Magento Mirror Import Magento Release 1.1.3 b5a5fba
Magento Mirror Import Magento Release 1.1.4 5b1e92d
Magento Mirror Import Magento Release 1.1.5 3fed190
Magento Mirror Import Magento Release 1.1.6 6bfe398
Magento Mirror Import Magento Release 1.1.7 9ebaba0
Magento Mirror Import Magento Release 1.1.8 4633251
Magento Mirror Import Magento Release 1.2.0 1588b75
Magento Mirror Import Magento Release 1.2.0.1 c55a10a
Magento Mirror Import Magento Release 1.2.0.2 1f631b0
@LeeSaferite LeeSaferite Import Magento Release 1.2.0.3 aadc3fa
@LeeSaferite LeeSaferite Import Magento Release 1.2.1 7496292
@LeeSaferite LeeSaferite Adding in repo level ignore file to prevent accidental commits contai…
…ning dynamic data
1529574
@LeeSaferite LeeSaferite Import Magento Release 1.2.1.1 7e3cf77
@LeeSaferite LeeSaferite Merge branch 'master' of git@github.com:magentomirror/magento-mirror 5f91b42
@LeeSaferite LeeSaferite Import Magento Release 1.2.1.2 4cf6b33
@LeeSaferite LeeSaferite Import Magento Release 1.3.0 c6d0972
@LeeSaferite LeeSaferite Import Magento Release 1.3.1 58cb158
@LeeSaferite LeeSaferite Import Magento Release 1.3.1.1 d583154
@LeeSaferite LeeSaferite Import Magento Release 1.3.2 f32ebf0
@LeeSaferite LeeSaferite Import Magento Release 1.3.2 81117fa
@LeeSaferite LeeSaferite Import Magento Release 1.3.2.1 0befb41
@LeeSaferite LeeSaferite Import Magento Release 1.3.2.2 0a542b3
@LeeSaferite LeeSaferite Import Magento Release 1.3.2.3 69c3ea0
@LeeSaferite LeeSaferite Import Magento Release 1.3.2.4 e3b8ddb
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha1 f97dcaa
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha2 21ef79d
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha3 52967ab
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-beta1 dd50889
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-rc1 0ffeefe
@LeeSaferite LeeSaferite Reverting magento-1.4.0.0-alpha1 thru magento-1.4.0.0-rc1 commits e1e0826
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha1 f7e4e00
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha2 7d6c516
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-alpha3 84a1ea6
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-beta1 788d81f
@LeeSaferite LeeSaferite Import Magento 1.4.0.0-rc1 473b844
@LeeSaferite LeeSaferite Import Magento 1.4.0.0 61c419b
@LeeSaferite LeeSaferite Import Magento 1.4.0.1 52438d7
@LeeSaferite LeeSaferite Import Magento Release 1.4.1.0 960045c
@LeeSaferite LeeSaferite Import Magento Release 1.4.1.1 9bb265e
@LeeSaferite LeeSaferite Import Magento Release 1.4.2.0 b7dc90c
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-alpha1 f3e3f62
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-alpha2 0663311
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-beta1 598ebd8
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-beta2 52e6ef6
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-rc1 69d36df
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0-rc2 d7bb289
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.0 2352cfb
@LeeSaferite LeeSaferite Fixing missing files 88e2a6b
@LeeSaferite LeeSaferite Import Magento Release 1.5.0.1 22c7660
@LeeSaferite LeeSaferite Import Magento Release 1.5.1.0 af7311d
@LeeSaferite LeeSaferite Import Magento Release 1.6.0.0-alpha1 a562c7f
@LeeSaferite LeeSaferite Import Magento Release 1.6.0.0-beta1
Also fixing the .gitignore file to stop leaving out files
1efcc40
@LeeSaferite LeeSaferite Import Magento Release 1.6.0.0-rc1 613dace
@LeeSaferite LeeSaferite Import Magento Release 1.6.0.0-rc2 6cea604
@LeeSaferite LeeSaferite Import Magento Release 1.6.0.0 d54fe93
@LeeSaferite LeeSaferite Merge branch 'magento-1.6' into magento-1.6-beta 197486d
@LeeSaferite LeeSaferite Import Magento Release 1.6.1.0-alpha1 b37626f
@LeeSaferite LeeSaferite Import Magento Release 1.6.1.0-beta1 16738b2
@LeeSaferite LeeSaferite Import Magento Release 1.6.1.0-rc1 8f27f9d
@LeeSaferite LeeSaferite Import Magento Release 1.6.1.0 461a8c3
@LeeSaferite LeeSaferite Merge branch 'magento-1.6-beta' into magento-1.6 ce07759
@LeeSaferite LeeSaferite Import Magento Release 1.7.0.0-alpha1 7aa9a6f
@LeeSaferite LeeSaferite Import Magento Release 1.7.0.0-beta1 e56274a
@LeeSaferite LeeSaferite Import Magento Release 1.7.0.0-rc1 1ea33f8
@LeeSaferite LeeSaferite Import Magento Release 1.7.0.0 3254aef
@LeeSaferite LeeSaferite Merge branch 'magento-1.7-beta' into magento-1.7 7652d08
@LeeSaferite LeeSaferite Merge remote-tracking branch 'magento-mirror/magento-1.7' into WithHi…
…story
b75280a
@LeeSaferite

This merge was done via:

git merge --no-ff -s ours magento-mirror/magento-1.7
@LeeSaferite LeeSaferite merged commit b7fb1ab into mageplus:master May 17, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.