Author: pierre
Date: Tue Jan 5 13:39:01 2021
New Revision: 12091
Log:
editor-manual-git: First git commands
Added:
branches/editor-manual-git/chapter03/clone.xml
- copied, changed from r12082,
branches/editor-manual-git/chapter03/checkout.xml
branches/editor-manual-git/chapter03/delmov.xml
- copied unchanged from r12090,
branches/editor-manual-git/chapter03/delete.xml
branches/editor-manual-git/chapter03/pull.xml
- copied, changed from r12090,
branches/editor-manual-git/chapter03/update.xml
branches/editor-manual-git/chapter03/rebase.xml
- copied unchanged from r12090,
branches/editor-manual-git/chapter03/moving.xml
Deleted:
branches/editor-manual-git/chapter03/delete.xml
branches/editor-manual-git/chapter03/moving.xml
branches/editor-manual-git/chapter03/update.xml
Modified:
branches/editor-manual-git/chapter03/chapter03.xml
branches/editor-manual-git/chapter03/introduction.xml
Modified: branches/editor-manual-git/chapter03/chapter03.xml
==============================================================================
--- branches/editor-manual-git/chapter03/chapter03.xml Tue Jan 5 09:08:28
2021 (r12090)
+++ branches/editor-manual-git/chapter03/chapter03.xml Tue Jan 5 13:39:01
2021 (r12091)
@@ -4,19 +4,20 @@
%general-entities;
]>
-<chapter id="chapter03" xreflabel="Basic Subversion Commands">
+<chapter id="chapter03" xreflabel="Basic Git Commands">
<?dbhtml filename="chapter03.html"?>
- <title>Basic Subversion Commands</title>
+ <title>Basic Git Commands</title>
<?dbhtml dir="chapter03"?>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="checkout.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="clone.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="pull.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="add.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="delete.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="update.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="delmov.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="commit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="diff.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="checkout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="merge.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="moving.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="rebase.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="diff.xml"/>
</chapter>
Copied and modified: branches/editor-manual-git/chapter03/clone.xml (from
r12082, branches/editor-manual-git/chapter03/checkout.xml)
==============================================================================
--- branches/editor-manual-git/chapter03/checkout.xml Mon Jan 4 09:57:08
2021 (r12082, copy source)
+++ branches/editor-manual-git/chapter03/clone.xml Tue Jan 5 13:39:01
2021 (r12091)
@@ -4,18 +4,30 @@
%general-entities;
]>
-<sect1 id="ch03-checkout">
- <title>svn checkout/co</title>
- <?dbhtml filename="checkout.html"?>
-
- <para><userinput>svn checkout</userinput> or <userinput>svn co</userinput>.
- This command is used to pull a Subversion directory such as
- <filename>LFS/BOOK</filename> (the LFS book) or <filename>BLFS</filename>
- (the BLFS book) from the server. You should only need to do this once. If
- we rearrange the directory structure (as is sometimes necessary), you may
- need to delete your local working copy and re-check it out.
- If this is going to be needed, it will usually be because an editor will
- have made a <emphasis>large</emphasis> change and it will be announced at
- least on the <email>lfs-b...@linuxfromscratch.org</email> list.
+<sect1 id="ch03-clone">
+ <title>git clone</title>
+ <?dbhtml filename="clone.html"?>
+
+ <para><userinput>git clone</userinput>.
+ This command is used to copy a public repository to the local machine
+ and checkout the <emphasis>master</emphasis> branch. You should only
+ need to do this once. Various options allow to create a
+ <quote>shallow</quote> rpository, that do not contain the full history or
+ all the branches. See <command>git help clone</command>.
</para>
+
+ <bridgehead renderas="sect4">Examples</bridgehead>
+
+ <para>
+ To clone the LFS repository with only read access:
+ </para>
+
+<screen><userinput>git clone git://gimli.linuxfromscratch.org/LFS
lfsbook</userinput></screen>
+
+ <para>
+ To clone with read/write access:
+ </para>
+
+<screen><userinput>git clone ssh://g...@gimli.linuxfromscratch.org/LFS
lfsbook</userinput></screen>
+
</sect1>
Copied: branches/editor-manual-git/chapter03/delmov.xml (from r12090,
branches/editor-manual-git/chapter03/delete.xml)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/editor-manual-git/chapter03/delmov.xml Tue Jan 5 13:39:01
2021 (r12091, copy of r12090,
branches/editor-manual-git/chapter03/delete.xml)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch03-delete">
+ <title>svn delete/del/remove/rm</title>
+ <?dbhtml filename="delete.html"?>
+
+ <para><userinput>svn delete</userinput>, <userinput>svn del</userinput>,
+ <userinput>svn remove</userinput>, or <userinput>svn rm</userinput>.
+ This does what it says: remove (a) file(s) from the repository on
belgarath.
+ Again, the file will not be deleted from the server until you do a
+ <userinput>svn commit</userinput>.
+ </para>
+</sect1>
Modified: branches/editor-manual-git/chapter03/introduction.xml
==============================================================================
--- branches/editor-manual-git/chapter03/introduction.xml Tue Jan 5
09:08:28 2021 (r12090)
+++ branches/editor-manual-git/chapter03/introduction.xml Tue Jan 5
13:39:01 2021 (r12091)
@@ -10,15 +10,28 @@
<para>Let's get familiar with the basic set of commands which all editors
will
use on an almost daily basis. There are many more options available than
the
- ones listed here, so you will want to read the Subversion documentation
- (<ulink url="http://svnbook.red-bean.com/"/>) at some point.
- <command>svn <option>help</option></command> also provides a useful quick
- reference for Subversion commands.
+ ones listed here, so you will want to read the Git documentation
+ (<ulink url="https://git-scm.com/book/en/v2";>Pro Git</ulink>) at some
+ point.
+ <command>git <option>help</option></command> also provides a useful quick
+ reference for Git commands. Sometimes <command>git status</command> shows
+ a couple of commands that an user might want to run in the current
+ state of the repository.
</para>
- <para>Some Subversion commands have multiple forms, the canonical command and
- one or more aliases. We'll list the canonical form and an alias in the
- descriptions. <command>svn <option>help</option></command> provides a list
- of all Subversion commands with all of their aliases.
- </para>
+ <note>
+ <title>Note to Subversion Users</title>
+
+ <para>
+ In addition to the local repository, git maintains a staging area,
+ also known as the index. The command <command>git add</command>
+ populates that staging area, and <command>git commit</command> is
+ used transfer the content of the index to the repository. This
+ allows for a fine control of what is committed, but several
+ shortcuts can be taken. Note that <command>git add</command> may not
+ only be used to add files, but also to store modifications to the
+ existing files.
+ </para>
+ </note>
+
</sect1>
Copied and modified: branches/editor-manual-git/chapter03/pull.xml (from
r12090, branches/editor-manual-git/chapter03/update.xml)
==============================================================================
--- branches/editor-manual-git/chapter03/update.xml Tue Jan 5 09:08:28
2021 (r12090, copy source)
+++ branches/editor-manual-git/chapter03/pull.xml Tue Jan 5 13:39:01
2021 (r12091)
@@ -5,22 +5,23 @@
]>
<sect1 id="ch03-update">
- <title>svn update/up</title>
- <?dbhtml filename="update.html"?>
+ <title>git pull</title>
+ <?dbhtml filename="pull.html"?>
- <para><userinput>svn update</userinput> or <userinput>svn up</userinput>.
- This command synchronizes your local working copy with the server and is
- probably, along with <userinput>svn commit</userinput> the command you will
- use most frequently. If you have made local changes, Subversion will try to
- merge any changes on the server with the changes you have made <emphasis>on
- your machine</emphasis>.
+ <para><userinput>git pull</userinput>.
+ This command synchronizes your local repository.
+ If you have made local changes, Git will try to
+ merge any changes on the server with the changes you have committed
+ <emphasis>on your machine</emphasis>. If the changes on the server overlap
+ with local uncommitted changes, the merge is cancelled, and the work tree
+ untouched.
</para>
- <para>You should always do a manual <command>svn <option>update</option>
- </command> before trying to commit changes in order to ensure that there
are
+ <para>You should always do a manual <command>git <option>pull</option>
+ </command> before trying to push changes in order to ensure that there are
no conflicts with changes that have been made since you started your work.
- Note that <command>svn <option>commit</option></command> will warn you if
- there is a conflict, in case you forget to perform an <command>svn
- <option>update</option></command>.
+ Note that <command>git <option>push</option></command> will warn you if
+ there is a conflict, in case you forget to perform an <command>git
+ <option>pull</option></command>.
</para>
</sect1>
Copied: branches/editor-manual-git/chapter03/rebase.xml (from r12090,
branches/editor-manual-git/chapter03/moving.xml)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/editor-manual-git/chapter03/rebase.xml Tue Jan 5 13:39:01
2021 (r12091, copy of r12090,
branches/editor-manual-git/chapter03/moving.xml)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch03-moving">
+ <title>svn move/mv/rename/ren</title>
+ <?dbhtml filename="moving.html"?>
+
+ <para><command>svn <option>move</option></command>, <command>svn <option>mv
+ </option></command>, <command>svn <option>rename</option></command> or
+ <command>svn <option>ren</option></command>. These commands move files from
+ one location to another. Note that the changes will only be reflected on
the
+ Subversion server after you run the <command>svn <option>commit</option>
+ </command> command.</para>
+</sect1>
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
