kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

missed these merge conflicts when manually rebasing too many files

Browse source 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
This commit is contained in:
SvenDowideit 2014-07-03 11:07:42 +10:00
parent 9fe95f1c5b
commit f8d9ecfb2c
13 changed files with 13 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/man/docker-pull.1.md
View file

@ -51,10 +51,5 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-push.1.md
View file

@ -45,9 +45,5 @@ listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

7
docs/man/docker-restart.1.md
View file

@ -18,10 +18,5 @@ Restart each container listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-rm.1.md
View file

@ -47,9 +47,5 @@ command. The use that name as follows:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-rmi.1.md
View file

@ -34,9 +34,5 @@ Here is an example of removing and image:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-run.1.md
View file

@ -369,9 +369,5 @@ changes will also be reflected on the host in /var/db.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

7
docs/man/docker-save.1.md
View file

@ -33,10 +33,5 @@ fedora image to a fedora-latest.tar:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-search.1.md
View file

@ -54,9 +54,5 @@ ranked 1 or higher:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-start.1.md
View file

@ -23,9 +23,5 @@ Start a stopped container.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-stop.1.md
View file

@ -19,9 +19,5 @@ Stop a running container (Send SIGTERM, and then SIGKILL after
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

6
docs/man/docker-tag.1.md
View file

@ -54,9 +54,5 @@ registry you must tag it with the registry hostname and port (if needed).
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

7
docs/man/docker-top.1.md
View file

@ -27,10 +27,5 @@ Run **docker top** with the ps option of -x:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

7
docs/man/docker-wait.1.md
View file

@ -24,10 +24,5 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>