![$git stash [save message]
$git stash list
$git stash pop [stash@{x}]
$git stash apply [stash@{x}]
$git stash drop stash@{x}
$git stash clear
$ git stash](https://image.slidesharecdn.com/gitworkshop-121014114151-phpapp01/85/Git-36-320.jpg)
![$git stash [save message]
$git stash list
$git stash pop [stash@{x}]
$git stash apply [stash@{x}]
$git stash drop stash@{x}
$ git stash](https://image.slidesharecdn.com/gitworkshop-121014114151-phpapp01/85/Git-37-320.jpg)
![$git stash [save message]
$git stash list
$git stash pop [stash@{x}]
$git stash apply [stash@{x}]
$git stash drop stash@{x}
$git stash clear
$ git stash](https://image.slidesharecdn.com/gitworkshop-121014114151-phpapp01/85/Git-38-320.jpg)
![[color] [merge]
diff = auto tool = vimdiff
status = auto [core]
branch = auto excludesfile = ~/.gitignore
ui = auto
[alias]
co = checkout
st = status -sb
wd = diff --word-diff
tlog = log --graph --pretty=oneline
--decorate --date=short
--abbrev-commit --branches
hist = log --pretty=format:"%C(yellow)%h %C(White)%ad |
%C(White)%s%d %C(Red)[%an]"
--graph --date=short
tips2: Setting](https://image.slidesharecdn.com/gitworkshop-121014114151-phpapp01/85/Git-45-320.jpg)
骋颈迟社内勉强会
- 1. WorkShop server-side engineer Daichi Hirata
- 2. Purpose Gitに対しての共通認識 Common understanding for Git ノウハウの共有 Sharing of knowledge
- 5. SVN Remote Repository Commit / Checkout Working Tree
- 6. Git Remote Repository Pull / Push .git internal Repository Working Tree stash Index
- 7. Component Repository Working Tree Index
- 8. Component git checkout Repository Working Tree いつでもリポジトリから以前の状態の ワーキングツリーをチェックアウト可能 You can check out the working tree from the repository Index at any time of the previous state.
- 9. Component git checkout ワーキングツリーの変更がイン デックスへ登録される Repository Change the working tree to the index is registered. Working Tree git add Index
- 10. Component git checkout インデックスの変更がリポジトリ へコミットされる Repository Working Tree Index changes are committed to the repository. git commit git add Index
- 11. Component Repository Working Tree 一時的な変更やコミットできない git stash 変更を退避させる Evacuate and commit changes that can not be a temporary change. Index stash
- 14. Commit ファイルツリー どれか１つでも異なれば同じファイ File tree ル、同じ内容でも異なるコミット 付加情報 the same ?le with different, Commit even with the same content but Additional information different if any one. 直前のコミット Last commit
- 16. Commit 任意のコミットから最初のコミット (initial commit) からそのコミットに 至る全ての履歴が取得できる History all the way to commit from the (initial commit) can be obtained from the ?rst commit commit any.
- 17. Branch あるコミット(そのブランチの最新のコ ミット)に至る履歴と将来 History and future leading to the (most recent commit on that branch) commit there.
- 18. Branch
- 19. Merge master hotfix C0 C1 C2
- 20. Merge master hotfix C0 C1 C2 C3
- 21. Merge master hotfix C0 C1 C2 C3
- 22. Merge master Fast foward hotfix C0 C1 C2 C3
- 23. Merge master C0 C1 C2 #11 C3 C4
- 24. Merge master C0 C1 C2 #11 C3 C4
- 25. Merge master C0 C1 C2 #11 C3 C4
- 26. Merge master C0 C1 C2 #11 C3 C4
- 27. Merge master C0 C1 C2 C5 C3 C4 #11
- 28. Rebase master C0 C1 C2 #11 C3 C4
- 29. Rebase master C0 C1 C2 #11 C3 C4
- 30. Rebase master master #11 C0 C1 C2 C3’ C4’ cherry-pick
- 31. Rebase master C0 C1 C4 C7 #12 C2 C3 C6 C5 C8 #13
- 32. Rebase master C0 C1 C4 C7 #12 C2 C3 C6 C5 C8 #13
- 33. Rebase master C0 C1 C4 C7 #12 C2 C3 C6 C5 C8 #13 $ git rebase --onto master #12 #13
- 34. Tips
- 35. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 36. $git stash [save message] $git stash list $git stash pop [stash@{x}] $git stash apply [stash@{x}] $git stash drop stash@{x} $git stash clear $ git stash
- 37. $git stash [save message] $git stash list $git stash pop [stash@{x}] $git stash apply [stash@{x}] $git stash drop stash@{x} $ git stash
- 38. $git stash [save message] $git stash list $git stash pop [stash@{x}] $git stash apply [stash@{x}] $git stash drop stash@{x} $git stash clear $ git stash
- 39. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 40. $git bisect start $git bisect bad $git bisect good rev $git bisect next $git bisect bad/good $git bisect reset $git bisect run <test_file> $git bisect
- 41. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 42. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 43. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 44. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
- 45. [color] [merge] diff = auto tool = vimdiff status = auto [core] branch = auto excludesfile = ~/.gitignore ui = auto [alias] co = checkout st = status -sb wd = diff --word-diff tlog = log --graph --pretty=oneline --decorate --date=short --abbrev-commit --branches hist = log --pretty=format:"%C(yellow)%h %C(White)%ad | %C(White)%s%d %C(Red)[%an]" --graph --date=short tips2: Setting
- 46. tips2: Setting - gst
- 47. tips2: Setting - ignore-changes
- 48. tips2: Setting - prompt