shoheiyokoyama · March 16, 2017 04:41
diff --git a/file0.txt b/file0.txt
 $ git commit -am"commit message"`
diff --git a/file1.txt b/file1.txt
 commit 2807055f737ee79962a7373996165598478704a3
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 09:44:08 2016 +0900

    fixed file1.text

diff --git a/file10.txt b/file10.txt
 $ git add .
 $ git commit --amend -m"commit mesage"
diff --git a/file11.txt b/file11.txt
 commit d9d1012289748c614787399ec3d1b8e98172c156
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 07:15:52 2016 +0900

    fixed2 sample-file

 commit 5de2cd2918e148a9317fc9192cfb635fd878fa49
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 07:15:30 2016 +0900

    fixed sample-file

 commit 63b89bece5a508c418f7c3a0c00a15f1a4b04ec1
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 07:14:50 2016 +0900

    create sample-file
diff --git a/file12.vim b/file12.vim

 pick 5de2cd2 fixed sample-file
 pick d9d1012 fixed2 sample-file

 ...
diff --git a/file13.vim b/file13.vim

 # sでもOK

 pick 5de2cd2 fixed sample-file
 s d9d1012 fixed2 sample-file

 ...
diff --git a/file14.vim b/file14.vim
 # This is a combination of 2 commits.
 # The first commit's message is:

 fixed sample-file

 # The is the 2nd commit's message:

 fixed2 sample-file

 ...

diff --git a/file15.txt b/file15.txt

 commit 422219b91022e006dc87766aab2e43cb4d670e89
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 07:26:34 2016 +0900

    fixed sample-file

    fixed2 sample-file

 commit 63b89bece5a508c418f7c3a0c00a15f1a4b04ec1
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 07:14:50 2016 +0900

    create sample-file

diff --git a/file16.txt b/file16.txt
 $ git reset --soft HEAD^
diff --git a/file17.txt b/file17.txt
 $ git reset --hard HEAD^
diff --git a/file18.txt b/file18.txt
 $ git reset --hard HEAD~x
diff --git a/file19.txt b/file19.txt
 $ git reset --hard HEAD
diff --git a/file2.txt b/file2.txt
 Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
 Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   firstFile.text

diff --git a/file20.txt b/file20.txt
 $ git reset HEAD filename
diff --git a/file21.txt b/file21.txt
 $ git branch

 * branch1
 master
diff --git a/file22.txt b/file22.txt
 $ git log

 commit 4ae31b629d788a576edd02426dabcb3a69ab62b2
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Nov 1 14:44:13 2016 +0900

    commit2

 commit d727ad50a8c673aacc727af6b9571697d99048db
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Nov 1 14:43:46 2016 +0900

    commit1
diff --git a/file23.txt b/file23.txt
 $ git checkout master
 Switched to branch 'master'

 $ git cherry-pick d727ad5
diff --git a/file24.txt b/file24.txt
 $ git cherry-pick d727ad5 -n
diff --git a/file25.txt b/file25.txt
 $ git cherry-pick branch1~2..branch1
diff --git a/file26.txt b/file26.txt
 $ git stash
diff --git a/file27.txt b/file27.txt
 $ git stash pop
diff --git a/file28.txt b/file28.txt
 $ git stash save "stash message"
diff --git a/file29.txt b/file29.txt
 $ git stash list

 stash@{0}: On master: stash message2
 stash@{1}: On master: stash message
diff --git a/file3.txt b/file3.txt
 commit a12388f3d3548ac713fe52b0da87279260055fff
 Author: shoheiyokoyama <[email protected]>
 Date:   Tue Oct 11 09:44:08 2016 +0900

    fixed file1.text

diff --git a/file30.txt b/file30.txt
 $ git stash pop stash@{1}
diff --git a/file31.txt b/file31.txt
 $ git stash apply pop stash@{1}
diff --git a/file32.txt b/file32.txt
 $ git stash drop stash@{1}
diff --git a/file33.txt b/file33.txt
 $ git stash clear
diff --git a/file34.txt b/file34.txt
 $ git checkout -b tagname refs/tags/tagname
diff --git a/file4.txt b/file4.txt
 commit 121a4d7729700d363e56b681e27518bf4ac0f34b
 Author: shoheiyokoyama <[email protected]>
 Date:   Fri Sep 30 11:10:56 2016 +0900

    third commit

 commit 3fbea2f615acf7878d76f94594932633d5e39e17
 Author: shoheiyokoyama <[email protected]>
 Date:   Fri Sep 30 11:07:13 2016 +0900

    second commit

 commit 404a1c9c88824e0921e3795a49a7c5e2ce7c27f7
 Author: shoheiyokoyama <[email protected]>
 Date:   Fri Sep 30 11:06:47 2016 +0900

    first commit
diff --git a/file5.vim b/file5.vim
 pick 3fbea2f second commit
 pick 121a4d7 third commit

 ...
diff --git a/file6.vim b/file6.vim

 # eでもOK

 edit 3fbea2f second commit
 pick 121a4d7 third commit

 ...
diff --git a/file7.txt b/file7.txt
 Stopped at 3fbea2f615acf7878d76f94594932633d5e39e17... second commit
 You can amend the commit now, with

    git commit --amend 

 Once you are satisfied with your changes, run

    git rebase --continue
diff --git a/file8.txt b/file8.txt
 $ git add .
 $ git commit --amend
diff --git a/file9.vim b/file9.vim
 second commit

 # Please enter commit message for your cahnges. Lines starting 
 # with '#' ignored, and an empty message aborts the commit
 # 
 # Date: ...
 # 
 # ...
	commit 2807055f737ee79962a7373996165598478704a3
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 09:44:08 2016 +0900

	fixed file1.text
	commit d9d1012289748c614787399ec3d1b8e98172c156
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 07:15:52 2016 +0900

	fixed2 sample-file

	commit 5de2cd2918e148a9317fc9192cfb635fd878fa49
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 07:15:30 2016 +0900

	fixed sample-file

	commit 63b89bece5a508c418f7c3a0c00a15f1a4b04ec1
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 07:14:50 2016 +0900

	create sample-file

	pick 5de2cd2 fixed sample-file
	pick d9d1012 fixed2 sample-file

	...

	# sでもOK

	pick 5de2cd2 fixed sample-file
	s d9d1012 fixed2 sample-file

	...
	# This is a combination of 2 commits.
	# The first commit's message is:

	fixed sample-file

	# The is the 2nd commit's message:

	fixed2 sample-file

	...

	commit 422219b91022e006dc87766aab2e43cb4d670e89
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 07:26:34 2016 +0900

	fixed sample-file

	fixed2 sample-file

	commit 63b89bece5a508c418f7c3a0c00a15f1a4b04ec1
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Oct 11 07:14:50 2016 +0900

	create sample-file
	Your branch is ahead of 'origin/master' by 1 commit.
	(use "git push" to publish your local commits)
	Changes not staged for commit:
	(use "git add <file>..." to update what will be committed)
	(use "git checkout -- <file>..." to discard changes in working directory)

	modified: firstFile.text
	$ git log

	commit 4ae31b629d788a576edd02426dabcb3a69ab62b2
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Nov 1 14:44:13 2016 +0900

	commit2

	commit d727ad50a8c673aacc727af6b9571697d99048db
	Author: shoheiyokoyama <[email protected]>
	Date: Tue Nov 1 14:43:46 2016 +0900

	commit1
	$ git checkout master
	Switched to branch 'master'

	$ git cherry-pick d727ad5
	$ git stash list

	stash@{0}: On master: stash message2
	stash@{1}: On master: stash message