Skip to content

Comments

image/spec: merge history of the v1, v1.1 and v1.2 specification#46374

Merged
thaJeztah merged 7 commits intomoby:masterfrom
thaJeztah:image_spec_combined
Aug 30, 2023
Merged

image/spec: merge history of the v1, v1.1 and v1.2 specification#46374
thaJeztah merged 7 commits intomoby:masterfrom
thaJeztah:image_spec_combined

Conversation

@thaJeztah
Copy link
Member

Thanks to some nice StackOverflow post for an approach;

This combines the 3 separate files, and preserving history (well, with
the help of git log --follow image/spec/spec.md).

git checkout master
git checkout -b image_spec_combined
git mv image/spec/v1.md image/spec/spec.md
# git commit .....

git checkout master
git checkout -b image_spec_1.1
git mv image/spec/v1.1.md image/spec/spec.md
# git commit .....

git checkout master
git checkout -b image_spec_1.2
git mv image/spec/v1.2.md image/spec/spec.md
# git commit .....


# merge the branches (after resolving conflicts)
git checkout image_spec_combined
git merge -S --signoff image_spec_1.1
git merge -S --signoff image_spec_1.2

To view the combined history:

git log --follow image/spec/spec.md

commit 939675dd24b4c765fce1c4f9286a3ab41880b5a2 (image_spec_1.2)
Author: Sebastiaan van Stijn <[email protected]>
Date:   Wed Aug 30 15:06:25 2023 +0200

    image/spec: rename v1.2.md to spec.md

    In preparation of merging the versioned-specs into a single file,
    with history.
...
...
commit 79910625f0a7aa76590e4362817dda22f28343aa
Author: Josh Hawn <[email protected]>
Date:   Sun Dec 7 23:25:31 2014 -0800

    Adds Docker Image v1 Spec Documention
...

- A picture of a cute animal (not mandatory but encouraged)

In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
This merges the v1.1 specs to provide a single history of the
specification.

To view the combined history:

    git log --follow image/spec/spec.md
This merges the v1.2 specs to provide a single history of the
specification.

To view the combined history:

    git log --follow image/spec/spec.md

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Add back files at the old locations, as there may be external links
referencing the specification.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 25.0.0 milestone Aug 30, 2023
@thaJeztah thaJeztah merged commit a74f1ab into moby:master Aug 30, 2023
@thaJeztah thaJeztah deleted the image_spec_combined branch August 30, 2023 15:56
@thaJeztah thaJeztah mentioned this pull request Oct 15, 2024
79 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants