01219245/git - ประวัติรุ่นแก้ไข

Jittat: /* Links */

2019-02-15T08:25:50Z

Links

Jittat: /* 3.2 Creating new branches */

2019-02-15T03:39:06Z

3.2 Creating new branches

Jittat: /* 3.2 Creating new branches */

2019-02-15T03:38:48Z

3.2 Creating new branches

Jittat: /* 3.1 Checkout old states */

2019-02-15T03:38:09Z

3.1 Checkout old states

Jittat: /* 1.2 Your (first) HTML page */

2019-02-15T03:35:57Z

1.2 Your (first) HTML page

Jittat: /* 1.1 Creating a new repository */

2019-02-15T03:34:55Z

1.1 Creating a new repository

Jittat เมื่อ 14:22, 18 มกราคม 2559

2016-01-18T14:22:26Z

Jittat: /* 3.2 Creating new branches */

2016-01-18T14:20:42Z

3.2 Creating new branches

Jittat: /* 2. Ignoring files */

2016-01-18T14:19:24Z

2. Ignoring files

Jittat: /* Preparations */

2016-01-18T14:18:35Z

Preparations

@@ แถว 409: / แถว 409: @@
 ** [http://www.youtube.com/watch?v=N7gOCp4UhZY Part 3] - covers basic branching mode and how to move the HEAD around the commit graphs
 * Other YouTube clips:
-** TBA
+** [https://www.youtube.com/watch?v=9vtjSo9IIBM Git] - Git (in Thai)

@@ แถว 353: / แถว 353: @@
 ==== 3.2 Creating new branches ====
-: '''Make sure that you have made some change and have commit it before proceeding further'''
+: '''*** Make sure that you have made some change and have commit it before proceeding further.'''
 We can call <tt>git branch</tt> to see the current branches:

←รุ่นแก้ไขก่อนหน้า		รุ่นแก้ไขเมื่อ 03:38, 15 กุมภาพันธ์ 2562
แถว 352:		แถว 352:

	==== 3.2 Creating new branches ====		==== 3.2 Creating new branches ====
		+
		+	: '''Make sure that you have made some change and have commit it before proceeding further'''

	We can call <tt>git branch</tt> to see the current branches:		We can call <tt>git branch</tt> to see the current branches:

@@ แถว 349: / แถว 349: @@
 </pre>
-Let's make some change to the files and commit the changes.
+Let's make some change to the files and '''commit''' the changes.
 ==== 3.2 Creating new branches ====

@@ แถว 68: / แถว 68: @@
 We will see this more clearly in our own page.
-Let's create a file called <tt>index.html</tt> in the directory that we have just created our Git repository.  Put the following in the file.  You may want to try [http://brackets.io/ Brackets] as your editor.
+Let's create a file called <tt>index.html</tt> in the directory that we have just created our Git repository.  Put the following in the file.  You may want to try [https://code.visualstudio.com/ Visual Studio Code] or [https://atom.io/ atom] as your editor.
 <syntaxhighlight lang="html5">

@@ แถว 26: / แถว 26: @@
 ==== 1.1 Creating a new repository ====
-. We will work with command line.  For Windows user, use '''<tt>cmd.exe</tt>'''.  For Mac/Linux, open a terminal program.
+. We will work with command line.  For Windows user, use '''<tt>cmd.exe</tt>'''.  Or use '''bash''' that comes with git. For Mac/Linux, open a terminal program.
 . Find a location in your file system, and create a new directory/folder for the practice.  Let's call the directory '''<tt>homepage</tt>'''.  The command for that is '''<tt>mkdir</tt>'''.

@@ แถว 16: / แถว 16: @@
 ** When the installer ask you the option to "Adjusting your PATH environment", choose "Run Git from Windows Command Prompt".
-{{Callta|You have installed <tt>git</tt>. Great job!  If you see this, it's a sign that you should call your TA to check your work.}}
+{{Callta|1. You have installed <tt>git</tt>. Great job!  If you see this, it's a sign that you should call your TA to check your work.}}
 == In-class practice ==
@@ แถว 56: / แถว 56: @@
   nothing to commit (create/copy files and use "git add" to track)
-{{Callta|Please show the TA where you have created the git repository.}}
+{{Callta|2. Please show the TA where you have created the git repository.}}
 ==== 1.2 Your (first) HTML page ====
@@ แถว 135: / แถว 135: @@
    create mode 100644 index.html
-{{Callta|When you finish committing, please call the TA to discuss your work.}}
+{{Callta|3. When you finish committing, please call the TA to discuss your work.}}
 ==== 1.4 Making changes ====
@@ แถว 264: / แถว 264: @@
 }}
-{{Callta|Show the TA that the link works and show the repository to the TA.}}
+{{Callta|4. Show the TA that the link works and show the repository to the TA.}}
 '''EXERCISE:''' It would be nice, if from the bio page, we can click back to the main page.  Add a hyperlink to the bio page linking back to <tt>index.html</tt>.  Commit your work.
@@ แถว 270: / แถว 270: @@
 '''EXERCISE:''' Add another page to your homepage.  It can be about anything.  Add hyperlinks between the index page and the new page.  Commit your work.
-{{Callta|Show the work to the TA.}}
+{{Callta|5. Show the work to the TA.}}
 ==== 1.6 More operations ====
@@ แถว 318: / แถว 318: @@
 Add <tt>.gitignore</tt> and commit all the changes.  '''Make sure that <tt>secret.html</tt> is not included in the commit.'''
-{{Callta|Show your work to the TA.}}
+{{Callta|6. Show your work to the TA.}}
 === 3. Practice with branching ===
@@ แถว 378: / แถว 378: @@
 At this point we have two branch and you can keep working on the new branch.  If you want to also work on the previous branch, <tt>git checkout</tt> is your friend.
-{{Callta|When you are done checking out the update branch, please call the TA.}}
+{{Callta|7. When you are done checking out the update branch, please call the TA.}}
 ==== 3.3 Moving master to the new location ====

←รุ่นแก้ไขก่อนหน้า		รุ่นแก้ไขเมื่อ 14:20, 18 มกราคม 2559
แถว 377:		แถว 377:

	At this point we have two branch and you can keep working on the new branch. If you want to also work on the previous branch, <tt>git checkout</tt> is your friend.		At this point we have two branch and you can keep working on the new branch. If you want to also work on the previous branch, <tt>git checkout</tt> is your friend.
		+
		+	{{Callta\|When you are done checking out the update branch, please call the TA.}}

	==== 3.3 Moving master to the new location ====		==== 3.3 Moving master to the new location ====

←รุ่นแก้ไขก่อนหน้า		รุ่นแก้ไขเมื่อ 14:19, 18 มกราคม 2559
แถว 317:		แถว 317:

	Add <tt>.gitignore</tt> and commit all the changes. '''Make sure that <tt>secret.html</tt> is not included in the commit.'''		Add <tt>.gitignore</tt> and commit all the changes. '''Make sure that <tt>secret.html</tt> is not included in the commit.'''
		+
		+	{{Callta\|Show your work to the TA.}}

	=== 3. Practice with branching ===		=== 3. Practice with branching ===