All Things Open, profile picture
Uploaded byAll Things Open
PDF, PPTX991 views

Version Control and Git - GitHub Workshop

The document discusses the principles of system design, emphasizing that the communication structures of organizations influence the designs they produce. It explores the functionalities of Git as a source control tool including automation, debugging, and branching strategies. A practical example showcases various Git commands demonstrating repository management, commit history, and collaboration workflows.

Technology◦
Related topics:
All Things Open•

Embed presentation

Download as PDF, PPTX
1 / 196
2 / 196
3 / 196
4 / 196
5 / 196
6 / 196
7 / 196
8 / 196
9 / 196
10 / 196
11 / 196
12 / 196
13 / 196
14 / 196
15 / 196
16 / 196
17 / 196
18 / 196
19 / 196
20 / 196
21 / 196
22 / 196
23 / 196
24 / 196
25 / 196
26 / 196
27 / 196
28 / 196
29 / 196
30 / 196
31 / 196
32 / 196
33 / 196
34 / 196
35 / 196
36 / 196
37 / 196
38 / 196
39 / 196
40 / 196
41 / 196
42 / 196
43 / 196
44 / 196
45 / 196
46 / 196
47 / 196
48 / 196
49 / 196
50 / 196
51 / 196
52 / 196
53 / 196
54 / 196
55 / 196
56 / 196
57 / 196
58 / 196
59 / 196
60 / 196
61 / 196
62 / 196
63 / 196
64 / 196
65 / 196
66 / 196
67 / 196
68 / 196
69 / 196
70 / 196
71 / 196
72 / 196
73 / 196
74 / 196
75 / 196
76 / 196
77 / 196
78 / 196
79 / 196
80 / 196
81 / 196
82 / 196
83 / 196
84 / 196
85 / 196
86 / 196
87 / 196
88 / 196
89 / 196
90 / 196
91 / 196
92 / 196
93 / 196
94 / 196
95 / 196
96 / 196
97 / 196
98 / 196
99 / 196
100 / 196
101 / 196
102 / 196
103 / 196
104 / 196
105 / 196
106 / 196
107 / 196
108 / 196
109 / 196
110 / 196
111 / 196
112 / 196
113 / 196
114 / 196
115 / 196
116 / 196
117 / 196
118 / 196
119 / 196
120 / 196
121 / 196
122 / 196
123 / 196
124 / 196
125 / 196
126 / 196
127 / 196
128 / 196
129 / 196
130 / 196
131 / 196
132 / 196
133 / 196
134 / 196
135 / 196
136 / 196
137 / 196
138 / 196
139 / 196
140 / 196
141 / 196
142 / 196
143 / 196
144 / 196
145 / 196
146 / 196
147 / 196
148 / 196
149 / 196
150 / 196
151 / 196
152 / 196
153 / 196
154 / 196
155 / 196
156 / 196
157 / 196
158 / 196
159 / 196
160 / 196
161 / 196
162 / 196
163 / 196
164 / 196
165 / 196
166 / 196
167 / 196
168 / 196
169 / 196
170 / 196
171 / 196
172 / 196
173 / 196
174 / 196
175 / 196
176 / 196
177 / 196
178 / 196
179 / 196
180 / 196
181 / 196
182 / 196
183 / 196
184 / 196
185 / 196
186 / 196
187 / 196
188 / 196
189 / 196
190 / 196
191 / 196
192 / 196
193 / 196
194 / 196
195 / 196
196 / 196
! GOTTA GROK GITAll Things Open October 22, 2014
!
! Tools, processes & communication.
! How Do Committees Invent? Melvin E. Conway Copyright 1968, F. D. Thompson Publications, Inc. Reprinted by permission of Datamation magazine, where it appeared April, 1968. That kind of intellectual activity which creates a whole from its diverse parts may be called the design of a system. Whether the particular activity is the creation of specifications for a major weapon system, the formation of a recommendation to meet a social challenge, or the programming of a computer, the general activity is largely the same. Typically, the objective of a design organization is the creation and assembly
Organizations which design systems are constrained to produce designs which are copies of the communication structures of these organizations. ! Melvin Conway
! 1968 HOW TO COMMITTEES INVENT? – DATAMATION
!
! Tools define communication.
! Communication define culture.
! Tools define culture.
! Chris Kelly IN MEATSPACE
! @amateurhuman ON THE INTERNET
!
!
! Productivity with better Git and GitHub.
! › git add . › git commit -m “blarg”
! Git is source control.
! Git is communication.
! Git is a debugger.
! Git is an enforcer.
! Git is automation.
! Git isn’t linear.
! Git isn’t permanent.
! Git isn’t GitHub.
!
!
!
!
! Going inside.
! › git init Initialized empty Git repository in /Users/amateurhuman/Repos/sample/.git/
! › tree .git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── info │ └── pack └── refs ├── heads └── tags
echo ‘All Things Open' | git hash-object -w --stdin ! › 69053dcce790795e81715f0189874eb444283a1a
! › tree .git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── 69 │ │ └── 053dcce790795e81715f0189874eb444283a1a │ ├── info │ └── pack └── refs ├── heads └── tags
› git cat-file -p 69053dcce7 All Things Open !
! › echo "MIT License" > LICENSE › git hash-object -w LICENSE d1e1072ee5e1d109c15b6fd18756aedc2a401840
› git cat-file -t d1e1072ee5 blob !
git update-index --add --cacheinfo 100644 d1e1072ee5e1d109c15b6fd18756aedc2a401 LICENSE ! ›
! › git write-tree 1e64e3ebbaf64bd48a0e4dfb90aec69b0f32e90d
git cat-file -p 1e64e3ebbaf64bd48a0e4dfb90aec69b0f32 ! › 100644 blob d1e1072ee5e1d109c15b6fd18756aedc2a401840 LICENSE
! › echo “Apache v2" > LICENSE › git update-index LICENSE › git update-index --add source.c
! › git write-tree 9b1fb9441319be18f900a443db6898f43c69e577
› git cat-file -p 9b1fb94413 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
› git cat-file -p 5c217fa6d7 Apache v2 !
echo "Initial commit" | git commit-tree 9b1fb9441319be18f900 ! › d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12
git update-index --add include/header.h ! › › git write-tree 6d189a0b90cb07212e7b7aee837c90fc7595a147
› git cat-file -p 6d189a0b90 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 040000 tree a2fe4c0988d4ad5b5637f09ab5874972328cb563 include 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
! echo "Add header" | git commit-tree 6d189a -p d8a926 › 532d9258310ee0a4eefcbd52e152dbf0238d9e63
! › git log 532d92 commit 532d9258310ee0a4eefcbd52e152dbf0238d9e63 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:25:30 2014 -0400 Add header commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
› git cat-file -p 532d9258310ee0a4eefcbd tree 6d189a0b90cb07212e7b7aee837c90fc7595a147 parent d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 author Chris Kelly <amateurhuman@gmail.com> 1413955530 -0400 committer Chris Kelly <amateurhuman@gmail.com> 1413955530 -0400 Add header !
› git cat-file -p 6d189a0b90cb07212e7b7a 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 040000 tree a2fe4c0988d4ad5b5637f09ab5874972328cb563 include 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
› git cat-file -p a2fe4c0988d4ad5b5637f0 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 header.h !
› git cat-file -p e69de29bb2d1d6434b8b29 /********************************************************************** ! header.h - $Author$ created at: Sun 10 12:06:15 Jun JST 2007 Copyright (C) 2007-2008 Yukihiro Matsumoto **********************************************************************/ #ifndef RUBY_H #define RUBY_H 1 #define HAVE_RUBY_DEFINES_H 1 #define HAVE_RUBY_ENCODING_H 1
! commit 532d92 tree 6d189a parent d8a926 author Chris committer Chris Add header tree 6d189a tree a2fe4c include blob 5c217f LICENSE blob e69de2 source.c tree a2fe4c0 blob e69de2 header.h blob e69de29 /******************** header.h - $Author$ created at: blob 5c217f Apache v2 blob e69de2 /******************** source.c -
! References available upon request.
! › tree .git/refs .git/refs ├── heads └── tags
! git update-ref refs/heads/master 532d92 ›
! › git log master commit 532d9258310ee0a4eefcbd52e152dbf0238d9e63 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:25:30 2014 -0400 Add header commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
› cat .git/refs/heads/master 532d9258310ee0a4eefcbd52e152dbf0238d9e63 !
! git update-ref refs/heads/initial d8a926 ›
! › git log initial commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
! › tree .git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── info │ └── pack └── refs ├── heads └── tags
! › git checkout initial › cat .git/HEAD ref: refs/heads/initial
! git update-ref refs/tags/v0.1 532d92 ›
! › tree .git/refs .git/refs ├── heads │ ├── initial │ └── master └── tags └── v0.1
! Getting code.
› git clone company/project ! company/project company/project working local remote
! › edit README.md company/project company/project working local remote README.md
! › git add README.md company/project company/project working local remote README.md
! company/project › git commit company/project working local remote README.md
› git push origin master ! company/project company/project working local remote README.md README.md
› git fetch origin master ! company/project company/project working local remote README.md README.md edit1
› git pull origin master ! company/project company/project working local remote README.md README.md edit1 edit1 edit2 edit2
git remote add upstream creator/ ! › company/project company/project working local remote creator/project
! › company/project company/project working local remote creator/project git fetch upstream edit3
! › git push origin master company/project company/project working local remote creator/project edit3 edit3
! GitHub Flow - Fork a repository - Create a feature branch - Make your changes - Push to your fork - Create a Pull Request
! Getting around.
! › git log commit 2f83b32f7123508239da5ed670a45e831d614ac7 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 22:36:17 2014 +0000 update doc. commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] commit 7ce520e90a2aa4fae492ecdd0cba5b4df92c9462
› git show 2f83b32f71235082 › git show 2f83b32f71 › git show 2f83b3 !
› git show 2f83b32f71235082 › git show v2.3 !
› git log --pretty=format: 2f83b32 update doc. 2f00c56 * ext/date/lib/date.rb: fix indent [ci skip] 7ce520e * ext/tk/tcltklib.c: (experimental) support Tcl/Tk8.6.2. * ext/tk/extconf.450307e * enum.c (nmin_run): max(n) and max_by(n) returns an array in descending 63fa57e * 2014-10-14 1f6fa32 ChangeLog: fix a typo for r47897. f77d22d common.mk: update-gems for older BASERUBY caa54c1 Revert r47899 8d7fa22 * lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem. [Featur 22e26d3 fix typo and spaces c66506e * lib/find.rb (Find.find): Call to_path for arguments to obtain strings. ! 89322aa * common.mk: use relative load path for bundled_gems directory. [Bug #10372] 4a883ff parse.y: keep nodes linking
! › git show 2f00c56 commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date when Infinity; return d <=> other.d when Numeric; return d
! › git show HEAD^ commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date when Infinity; return d <=> other.d when Numeric; return d
! › git show HEAD~3 commit 450307e38315f81c10d959054c49d8baed522027 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 16:30:07 2014 +0000 2f00c56eb78696dc30b7d218bd32f10b9e96028a zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 20:16:* ext/enum.date/c (nmin_lib/date.run): rb: max(fix n) indent and max_[ci by(skip] n) returns an array in descending order. [ruby-core:65452] Suggested by David Grayson. diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date diff --git a/ChangeLog b/ChangeLog index faecb02..aa563ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ when Infinity; return d <=> other.d when Numeric; return d
! › git show HEAD~3 commit 450307e38315f81c10d959054c49d8baed522027 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 16:30:07 2014 +0000 * enum.c (nmin_run): max(n) and max_by(n) returns an array in descending order. [ruby-core:65452] Suggested by David Grayson. diff --git a/ChangeLog b/ChangeLog index faecb02..aa563ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ ^^^
! › git log master..fix commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
! › git log commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 ^master fix Fix text overflowing out of scroll view when soft wrapped
! › git log commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 fix ^master Fix text overflowing out of scroll view when soft wrapped
fix --not master ! › git log commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
› git log fix fix2 ^master commit 7a5dcdde4939c254f79bb737d31ed6c75117a8dd Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 11:49:12 2014 +0100 ! Breaking stuff commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
! › git show 8345091 commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped diff --git a/stylesheets/zen.less b/stylesheets/zen.less index 5b5cf64..786ec25 100644 --- a/stylesheets/zen.less +++ b/stylesheets/zen.less @@ -14,6 +14,10 @@ width: 700px; margin: 0 auto;
› git lol fix..master 36ffb49 2014-10-10 (HEAD, master) width is configurable [Chris Wanstrath] f8e758c 2014-10-10 (v0.8.0) Prepare 0.8.0 release [Chris Wanstrath] 0434992 2014-10-10 fix config names [Chris Wanstrath] 9a0f4d8 2014-10-10 (v0.7.0) Prepare 0.7.0 release [Chris Wanstrath] 4f5b8a2 2014-10-10 :lipstick: [Chris Wanstrath] e187c92 2014-10-10 Reorganize enter / exit code a bit. [Chris Wanstrath] 9265568 2014-10-10 Piggy-back on preferredLineLength in the config [Chris Wanstrath] 7da2ae0 2014-10-10 Default width to editor.preferredLineLength [Chris Wanstrath] a4c4a02 2014-10-10 Make width configurable [Chris Wanstrath] cea10c6 2014-10-10 :lipstick: [Chris Wanstrath] 6637c13 2014-10-10 Hide the TreeView so people can unhide it. [Chris Wanstrath] ! 9057633 2014-10-10 remove soft wrap testing comment [Chris Wanstrath] 0a2d244 2014-10-10 Automatically soft wrap. Closes #24 [Chris Wanstrath]
! git log origin/master..HEAD ›
! › git log gc.c commit a223ff83b07061fe6b7259a72041c4adcc87421b Author: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Sat Aug 30 16:29:40 2014 +0000 merge revision(s) r46387: [Backport #9607] * gc.c: change full GC timing to keep lower memory usage. Extend heap only at (1) after major GC or (2) after several (two times, at current) minor GC Details in https://bugs.ruby-lang.org/issues/9607#note-9 [Bug #9607]
› git lol gc.c --since=1.month.ago 2ccf728 2014-09-23 (HEAD, origin/ruby_2_1, ruby_2_1) merge revision(s) r47696,r47697 ee69bb4 2014-09-23 merge revision(s) r47641,r47642,r47644: [Backport #10262] [nagachika] c8ec78c 2014-09-23 merge revision(s) r47683: [Backport #10281] [nagachika] 77ce45d 2014-09-23 merge revision(s) r47111,r47212,r47451,r47452,r47680: [Backpor 7693578 2014-09-23 * version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.4. [nagachika] !
! https://github.com/atom/atom/compare/master...ns-immutable-display-state
! https://github.com/atom/atom/compare/ns-immutable-display-state...master
!
!
! Stop working & start playing.
› git status # On branch long-branch # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: lib/zen.coffee # # 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: menus/zen.cson # !
› git stash Saved working directory and index state WIP on long-branch: 36ffb49 width is configurable HEAD is now at 36ffb49 width is configurable !
! › git status # On branch long-branch nothing to commit, working directory clean
! › git stash list stash@{0}: WIP on long-branch: 36ffb49 width is configurable stash@{1}: WIP on long-branch: 36ffb49 width is configurable
› git stash # On branch some-other-branch # 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: lib/zen.coffee # modified: menus/zen.cson # no changes added to commit (use "git add" and/or "git commit -a") ! apopply
! › git branch boyscout
› git reset master^^^ --hard HEAD is now at abcc6b1 rip staff1.rs !
! › git checkout boyscout Switched to branch 'boyscout'
› git checkout fix -- path/file.md !
! › git checkout HEAD -- README.md
! › git checkout -- README.md
! › git checkout -f master Switched to branch 'master'
! › git reset --hard HEAD HEAD is now at bcc8845 width is configurable
! › git reset --hard HEAD^^^ HEAD is now at 9bd382b Prepare 0.7.0 release
git update-ref refs/heads/experiment bcc8845 ! ›
! › git status On branch experiment Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: README.md new file: keymaps/zen.cson deleted: keymaps/zen.darwin.cson deleted: keymaps/zen.linux.cson deleted: keymaps/zen.win32.cson modified: lib/zen.coffee modified: stylesheets/zen.less
! › git revert 6767ce1 [experiment 54f3848] Revert "Updated README" 1 file changed, 1 insertion(+), 1 deletion(-)
! › git revert 54f3848 [experiment 8b7885f] Revert "Revert "Updated README"" 1 file changed, 1 insertion(+), 1 deletion(-)
! › git revert 54f3848 [experiment 8b7885f] IR ehvaervet "nRo eivdeerat "wUhapdt aIt'edm RdEoAiDnMgE"" 1 file changed, 1 insertion(+), 1 deletion(-)
! Diff to the second degree.
! › ack -i zen keymaps/zen.cson 2: 'ctrl-shift-cmd-F': 'zen:toggle' 3: 'cmd-ctrl-z': 'zen:toggle' 5: 'ctrl-shift-cmd-F': 'zen:toggle' 6: 'cmd-ctrl-z': 'zen:toggle' 9: 'shift-f11': 'zen:toggle' 10: 'ctrl-shift-Z': 'zen:toggle' 12: 'shift-f11': 'zen:toggle' 13: 'ctrl-shift-Z': 'zen:toggle' 16: 'shift-f11': 'zen:toggle' 17: 'ctrl-shift-Z': 'zen:toggle' 19: 'shift-f11': 'zen:toggle' 20: 'ctrl-shift-Z': 'zen:toggle'
! find . -not -path '*/.*' -type f -exec sed -i '' s/zen/focused/ {} + ›
! › git diff diff --git a/keymaps/zen.cson b/keymaps/zen.cson index 3784f7c..2f53ded 100644 --- a/keymaps/zen.cson +++ b/keymaps/zen.cson @@ -1,20 +1,20 @@ '.platform-darwin .workspace': - 'ctrl-shift-cmd-F': 'zen:toggle' - 'cmd-ctrl-z': 'zen:toggle' + 'ctrl-shift-cmd-F': 'focused:toggle' + 'cmd-ctrl-z': 'focused:toggle' '.platform-darwin .workspace .editor:not(.mini)': - 'ctrl-shift-cmd-F': 'zen:toggle' - 'cmd-ctrl-z': 'zen:toggle'
! › ack -i zen lib/zen.coffee 14: fullscreen = atom.config.get 'Zen.fullscreen' 15: width = atom.config.get 'Zen.width' 21: # Enter Zen 47: # Exit Zen menus/zen.cson 6: 'label': 'Zen' package.json 2: "name": “Zen”, README.md
› git stash Saved working directory and index state WIP on master: 36ffb49 width is configurable HEAD is now at 36ffb49 width is configurable !
! find . -not -path '*/.*' -type f -exec sed -i '' -e s/zen/focused/ -e s/Zen/Focused/ {} + ›
! › git diff stash@{0} diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. @@ -7,7 +7,7 @@ fullscreen command: - `cmd-ctrl-shift-F` on OSX - `shift-F11` on Windows and Linux.
! Committing is communicating.
! › git commit -m “fixed” [master f93a0fe] fixed 7 files changed, 47 insertions(+), 47 deletions(-) rewrite keymaps/zen.cson (60%)
! › git show HEAD commit f93a0fe0833d22d1c045e323b5e4aab22b25f4ee Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 13:26:58 2014 +0100 fixed diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused
! › git reset HEAD^ Unstaged changes after reset: M README.md M keymaps/zen.cson M lib/zen.coffee M menus/zen.cson M package.json M spec/zen-spec.coffee M stylesheets/zen.less
! › git commit 1 2 # Please enter the commit message for your changes. Lines starting 3 # with '#' will be ignored, and an empty message aborts the commit. 4 # On branch master 5 # Your branch is ahead of 'origin/master' by 29 commits. 6 # (use "git push" to publish your local commits) 7 # 8 # Changes to be committed: 9 # (use "git reset HEAD <file>..." to unstage) 10 # 11 #>......modified: README.md 12 #>......modified: keymaps/zen.cson 13 #>......modified: lib/zen.coffee Rename package to Focused There is already a package in the Atom packages named Zen. Even though the existing package only outputs haiku-on-command, the owner is a friend. This patch replaces all instances of 'zen|Zen' with 'focused|Focused'. If you don't like the name, you can pick a new one and run: find . -not -path '*/.*' -type f -exec sed -i '' -e s/zen/focused/ -e s/Zen/Focused/ {} +
› git format-patch -n HEAD^ From d0f5920b3a27f2152394571cf2b1f82f118cd1fe Mon Sep 17 00:00:00 2001 From: Chris Kelly <amateurhuman@gmail.com> Date: Thu, 13 Oct 2014 13:30:56 +0100 Subject: [PATCH 1/1] Rename package to Focused There is already a package in the Atom packages named Zen. Even though the existing package only outputs haiku-on-command, the owner is a friend. This patch replaces all instances of 'zen|Zen' with 'focused|Focused'. If you don't like the name, you can pick a new one and run: find . -not -path '*/.*' ! -type f -exec sed -i ''
! › git add -p diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]?
! › ? y - stage this hunk n - do not stage this hunk q - quit; do not stage this hunk nor any of the remaining ones / - search for a hunk matching the given regex J - leave this hunk undecided, see next hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk ? - print help
› git commit -m "Callback [master 1953833] Callback handler fixed 2 files changed, 12 insertions(+), 12 deletions(-) !
! › git log commit 4e05bc85139f0fceb2e1e60ec3b6732cc38e9f3f Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 14:08:55 2014 +0100 Rename main function commit 19538336d7c63097fc865f7b017c48c5b5e93d8d Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 14:08:35 2014 +0100 Callback handler fixed commit df9df8a911477becd723e813f564e023c11641a8
! › git rebase -i HEAD~4 [detached HEAD b442281] Rename package to Focused 7 files changed, 46 insertions(+), 46 deletions(-) rewrite keymaps/zen.cson (60%) Successfully rebased and updated refs/heads/master. 1 # pick This e8f500d is a combination Fix order of of specs 2 commits. 2 # squash pick The 6017931 first 6017931 commit's Styles Styles tweaked message tweaked is: 3 pick 63a108c Callback handler fixed 4 pick squash Fix order eb4f7b9 eb4f7b9 of Rename specs Rename main main function function 5 6 # Update Rebase function 36ffb49..eb4f7b9 onto 36ffb49 7 # 8 # Styles Commands: tweaked 9 # p, pick = use commit 10 Rename # r, reword main function = use commit, but edit the commit message 11 # e, edit = use commit, but stop for amending 12 # This s, squash is the = 2nd use commit commit, message: but meld into previous commit 13 # f, fixup = like "squash", but discard this commit's log message
! › git rebase --abort
! › git commit --amend 1 FIx typo 2 3 # Please enter the commit message for your changes. Lines starting 4 # with '#' will be ignored, and an empty message aborts the commit. 5 # On branch master 6 # Your branch is ahead of 'origin/master' by 27 commits. 7 # (use "git push" to publish your local commits) 8 # 9 # Changes to be committed: 10 # (use "git reset HEAD^1 <file>..." to unstage) 11 # 12 #>......modified: README.md
! Bisect for debugging.
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu]  7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn]  method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu]
! › git bisect start › git bisect bad › git bisect good v2.3
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect start
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good v3.2 Bisecting: 36 revisions left !
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad Bisecting: 18 revisions left !
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good Bisecting: 9 revisions left !
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad Bisecting: 4 revisions left !
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good 1779f77 is first bad commit !
a98e343 2013-12-17 vm_trace.c: isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect reset
Cleanliness is next to Godliness. !
! › git branch --merged fix-soft-wrapped-text-overflow rename-package * master
› git branch --no-merged ! long-running-branch experiment-that-failed hot-fix
! › git branch -d hot-fix error: The branch 'hot-fix' is not fully merged. If you are sure you want to delete it, run 'git branch -D hot-fix'.
! git branch --merged | grep -v "*" | xargs -n 1 git branch -d && git push origin --delete ›
git remote prune origin --dry-run ! › long-running-branch experiment-that-failed hot-fix
Laziness is next to Godliness. !
! › git commit -m “Fixes #42” Fix, Fixes, Fixed Close, Closes, Closed Resolve, Resolves, Resolved
! git commit -m “Fixes defunkt/zen#42” ›
! git commit -m “Update README [ci skip]” ›
› git status # On branch master # Your branch is ahead of 'origin/master' by 26 commits. # (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: README.md # modified: keymaps/zen.cson # modified: lib/zen.coffee # modified: menus/zen.cson # modified: package.json !
! › git status -sb ## master...origin/master [ahead 26] M README.md M keymaps/zen.cson M lib/zen.coffee M menus/zen.cson M package.json M spec/zen-spec.coffee M stylesheets/zen.less
! git config --global alias.st 'status -sb' ›
› git status # On branch master # Your branch is ahead of 'origin/master' by 26 commits. # (use "git push" to publish your local commits) # # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README.md # # 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) !
! › git diff --staged diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. @@ -7,7 +7,7 @@ fullscreen command: - `cmd-ctrl-shift-F` on OSX - `shift-F11` on Windows and Linux.
! git config --global alias.ds 'diff --staged‘ ›
! ~/Repos/zen/ on master* with unpushed [(03:10 PM) amateurhuman@tillandisa] ›
! ~/Repos/zen/ on master* with unpushed [(03:10 PM) amateurhuman@tillandisa] › git_branch() { echo $(/usr/bin/git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'}) }
! ~/Repos/zen/ on master* with unpushed [(03:10 PM) amateurhuman@tillandisa] › git_dirty() { st=$(/usr/bin/git status 2>/dev/null | tail -n 1) if [[ $st == "" ]] then echo "" else if [[ $st == "nothing to commit, working directory clean" ]] then echo "on %{$fg[green]%}$(git_prompt_info)%{$reset_color%}" else echo "on %{$fg[yellow]%}$(git_prompt_info)*%{$reset_color%}" fi fi }
! ~/Repos/zen/ on master* with unpushed [(03:10 PM) amateurhuman@tillandisa] › unpushed () { /usr/bin/git cherry -v origin/$(git_branch) 2>/dev/null } need_push () { if [[ $(unpushed) == "" ]] then echo " " else echo " with %{$fg[magenta]%}unpushed%{$reset_color%} " fi }
! Keyboard Shortcuts.
! t
! w
! l
! y
! - fuzzy match a file - switch branches - highlight line number(s) - get the permanent url t w l y HTTPS://HELP.GITHUB.COM/ARTICLES/USING-KEYBOARD-SHORTCUTS
! Let the machines do the work.
!
!
!
!
!
! Real teams communicate.
! 447
!
!
! Email isn’t dead.
!
!
! Git is there to help.
! Git is your friend.
Git is sometimes your drunk friend. !
training.github.com !
! Thank you.
! @amateurhuman QUESTIONS?

More Related Content

PDF
Git real slides
byLucas Couto
 
ODP
Eat my data
byPeng Zuo
 
PDF
slides.pdf
byvidsvagi
 
KEY
Working with Git
byPete Nicholls
 
PDF
That's (g)it! par Sébastien Dawans CETIC
byLa FeWeb
 
PDF
Deep dark-side of git: How git works internally
bySeongJae Park
 
PDF
GIT: Content-addressable filesystem and Version Control System
byTommaso Visconti
 
PDF
Git Real
byGong Haibing
 
Git real slides
byLucas Couto
 
Eat my data
byPeng Zuo
 
slides.pdf
byvidsvagi
 
Working with Git
byPete Nicholls
 
That's (g)it! par Sébastien Dawans CETIC
byLa FeWeb
 
Deep dark-side of git: How git works internally
bySeongJae Park
 
GIT: Content-addressable filesystem and Version Control System
byTommaso Visconti
 
Git Real
byGong Haibing
 

What's hot

PDF
Git training v10
bySkander Hamza
 
PDF
Git training
byJérémy Gobet
 
PDF
Git internals
byinsanehong Kim
 
PDF
Git & Github for beginners
byPaulo Henrique Nonaka
 
PDF
Git - Get Ready To Use It
byDaniel Kummer
 
PDF
Thinking in Git
byGreat Wide Open
 
PDF
Svn to-git
byjwausle
 
PDF
Git and Unity
byTim Pettersen
 
PDF
VCS for Teamwork - GIT Workshop
byAnis Ahmad
 
PDF
Tracking huge files with Git LFS - LinuxCon 2016
byTim Pettersen
 
PPTX
Using Git as your VCS with Bioconductor
bytimyates
 
PPTX
Git operation 101
byKyohei Moriyama
 
PDF
Git the Docs: A fun, hands-on introduction to version control
byBecky Todd
 
PDF
Tracking large game assets with Git LFS
byTim Pettersen
 
PDF
Git - a powerful version control tool
byKuo-Le Mei
 
PDF
DevOps for Opensource Geospatial Applications
bytlpinney
 
PDF
Курс Java-2016. Занятие 04 (часть 2). Git и GitHub
by7bits
 
PDF
Ankara jug mayıs 2013 sunumu
byAnkara JUG
 
PDF
Golang and Domain Specific Languages - Lorenzo Fontana - Codemotion Rome 2017
byCodemotion
 
PDF
(131116) #fitalk extracting user typing history on bash in mac os x memory
byINSIGHT FORENSIC
 
Git training v10
bySkander Hamza
 
Git training
byJérémy Gobet
 
Git internals
byinsanehong Kim
 
Git & Github for beginners
byPaulo Henrique Nonaka
 
Git - Get Ready To Use It
byDaniel Kummer
 
Thinking in Git
byGreat Wide Open
 
Svn to-git
byjwausle
 
Git and Unity
byTim Pettersen
 
VCS for Teamwork - GIT Workshop
byAnis Ahmad
 
Tracking huge files with Git LFS - LinuxCon 2016
byTim Pettersen
 
Using Git as your VCS with Bioconductor
bytimyates
 
Git operation 101
byKyohei Moriyama
 
Git the Docs: A fun, hands-on introduction to version control
byBecky Todd
 
Tracking large game assets with Git LFS
byTim Pettersen
 
Git - a powerful version control tool
byKuo-Le Mei
 
DevOps for Opensource Geospatial Applications
bytlpinney
 
Курс Java-2016. Занятие 04 (часть 2). Git и GitHub
by7bits
 
Ankara jug mayıs 2013 sunumu
byAnkara JUG
 
Golang and Domain Specific Languages - Lorenzo Fontana - Codemotion Rome 2017
byCodemotion
 
(131116) #fitalk extracting user typing history on bash in mac os x memory
byINSIGHT FORENSIC
 

Viewers also liked

PDF
Open Source in Healthcare
byAll Things Open
 
PDF
Open Data + Open Government = Open Goodness
byAll Things Open
 
PDF
The Anti-Henry Ford: How 200 hour discoveries revolutionized the way we do bu...
byAll Things Open
 
PPT
Open Sourcing the Public Library
byAll Things Open
 
PDF
Open Source Systems Administration
byAll Things Open
 
PDF
The PHP Renaissance
byAll Things Open
 
PDF
HTML for the Mobile Web, Firefox OS
byAll Things Open
 
PPTX
Javascript - The Stack and Beyond
byAll Things Open
 
PDF
Choosing a Javascript Framework
byAll Things Open
 
PDF
Ansible - 1,000,000 Downloads and Counting
byAll Things Open
 
PDF
What Academia Can Learn from Open Source
byAll Things Open
 
PDF
Building the iRODS Consortium
byAll Things Open
 
PDF
Open Source & The Internet of Things
byAll Things Open
 
PPTX
How to Use Cryptography Properly: Common Mistakes People Make When Using Cry...
byAll Things Open
 
PDF
Battle of the Stacks
byAll Things Open
 
PDF
Developing Apps for Google Glass Using Javascript & Ruby
byAll Things Open
 
PDF
Case Study: We're Watching You: How and Why Researchers Study Open Source And...
byAll Things Open
 
ODP
How Raleigh Became an Open Source City
byAll Things Open
 
PDF
What Does Big Data Really Mean for Your Business?
byAll Things Open
 
PPTX
All Things Open Opening Keynote
byAll Things Open
 
Open Source in Healthcare
byAll Things Open
 
Open Data + Open Government = Open Goodness
byAll Things Open
 
The Anti-Henry Ford: How 200 hour discoveries revolutionized the way we do bu...
byAll Things Open
 
Open Sourcing the Public Library
byAll Things Open
 
Open Source Systems Administration
byAll Things Open
 
The PHP Renaissance
byAll Things Open
 
HTML for the Mobile Web, Firefox OS
byAll Things Open
 
Javascript - The Stack and Beyond
byAll Things Open
 
Choosing a Javascript Framework
byAll Things Open
 
Ansible - 1,000,000 Downloads and Counting
byAll Things Open
 
What Academia Can Learn from Open Source
byAll Things Open
 
Building the iRODS Consortium
byAll Things Open
 
Open Source & The Internet of Things
byAll Things Open
 
How to Use Cryptography Properly: Common Mistakes People Make When Using Cry...
byAll Things Open
 
Battle of the Stacks
byAll Things Open
 
Developing Apps for Google Glass Using Javascript & Ruby
byAll Things Open
 
Case Study: We're Watching You: How and Why Researchers Study Open Source And...
byAll Things Open
 
How Raleigh Became an Open Source City
byAll Things Open
 
What Does Big Data Really Mean for Your Business?
byAll Things Open
 
All Things Open Opening Keynote
byAll Things Open
 

Similar to Version Control and Git - GitHub Workshop

ODP
Introduction to Git (Greg Lonnon)
byBoise Web Technologies Group
 
KEY
The everyday developer's guide to version control with Git
byE Carter
 
PPTX
Git Basic
byLuke Luo
 
PDF
Git internals
byHaggai Philip Zagury
 
KEY
Git
byjimmythrasher
 
PDF
Embedded Systems: Lecture 11: Introduction to Git & GitHub (Part 2)
byAhmed El-Arabawy
 
KEY
Git Magic: Versioning Files like a Boss
bytmacwilliam
 
PDF
slides.pdf
bytanuwedsmanu
 
PPTX
Six3 Getting Git
byDaniel Cox
 
PDF
Git_real_slides
byKhanh NL-bantoilatoi
 
ODP
Practical git for developers
byWim Godden
 
PDF
GTFO: Git Theory For OpenSource
byForest Mars
 
PPTX
git internals
byDennis Byrne
 
PDF
Getting some Git
byBADR
 
PDF
Git Concepts, Commands and Connectivity
byRaja Soundaramourty
 
PDF
Git in action
byAleksei Kornev
 
PPTX
Get going with_git_ppt
byMiraz Al-Mamun
 
PDF
Understanding git
byAvik Das
 
PPT
Introduction to Git
byatishgoswami
 
PDF
Git for beginners
byVinh Nguyen
 
Introduction to Git (Greg Lonnon)
byBoise Web Technologies Group
 
The everyday developer's guide to version control with Git
byE Carter
 
Git Basic
byLuke Luo
 
Git internals
byHaggai Philip Zagury
 
Git
byjimmythrasher
 
Embedded Systems: Lecture 11: Introduction to Git & GitHub (Part 2)
byAhmed El-Arabawy
 
Git Magic: Versioning Files like a Boss
bytmacwilliam
 
slides.pdf
bytanuwedsmanu
 
Six3 Getting Git
byDaniel Cox
 
Git_real_slides
byKhanh NL-bantoilatoi
 
Practical git for developers
byWim Godden
 
GTFO: Git Theory For OpenSource
byForest Mars
 
git internals
byDennis Byrne
 
Getting some Git
byBADR
 
Git Concepts, Commands and Connectivity
byRaja Soundaramourty
 
Git in action
byAleksei Kornev
 
Get going with_git_ppt
byMiraz Al-Mamun
 
Understanding git
byAvik Das
 
Introduction to Git
byatishgoswami
 
Git for beginners
byVinh Nguyen
 

More from All Things Open

PDF
Agentic AI for Developers and Data Scientists Build an AI Agent in 10 Lines o...
byAll Things Open
 
PDF
Authoring a GNOME Shell Extension: A Developer's Journey as an Open-Source Pr...
byAll Things Open
 
PDF
Supply Chain Robots, Electric Sheep, and SLSA
byAll Things Open
 
PDF
Developing Kubernetes Integrations for the On-Premises Cloud
byAll Things Open
 
PDF
Agentic AI, Interoperability, and Automation: Lessons from the Past, Visions ...
byAll Things Open
 
PDF
AI-Driven DevOps: How LLMs and Agents Are Changing Software Delivery
byAll Things Open
 
PDF
Keynote: X-rAI Specs, Submarines and Juice
byAll Things Open
 
PDF
Unconventional Backgrounds: The Secret Sauce of Diversity
byAll Things Open
 
PDF
The Missing Link to Inclusion and Performance
byAll Things Open
 
PDF
Incorporating AI Into Your SDLC: Leveraging AI tooling across the phases of y...
byAll Things Open
 
PDF
Linux Command-line Tips and Tricks - ATO 2025
byAll Things Open
 
PDF
ERG as a Bridge: Driving Inclusion in Open Source
byAll Things Open
 
PPTX
AI and Linux in 2025 - Jay LaCroix, Learn Linux TV
byAll Things Open
 
PPTX
What If the Quietest Person is the Smartest in the Room?
byAll Things Open
 
PDF
With AIs Wide Open… - All Things Open 2025
byAll Things Open
 
PDF
Everything You Need to Know About Running LLMs Locally
byAll Things Open
 
PDF
Rolling out Enterprise AI: Tools, Insights, and Team Empowerment
byAll Things Open
 
PDF
Tech Hiring Is Not Dead - You Just Actually Have To Try
byAll Things Open
 
PDF
Open Source Post-Quantum Cryptography - Matt Caswell
byAll Things Open
 
PPTX
Big Data on a Small Budget: Scalable Data Visualization for the Rest of Us - ...
byAll Things Open
 
Agentic AI for Developers and Data Scientists Build an AI Agent in 10 Lines o...
byAll Things Open
 
Authoring a GNOME Shell Extension: A Developer's Journey as an Open-Source Pr...
byAll Things Open
 
Supply Chain Robots, Electric Sheep, and SLSA
byAll Things Open
 
Developing Kubernetes Integrations for the On-Premises Cloud
byAll Things Open
 
Agentic AI, Interoperability, and Automation: Lessons from the Past, Visions ...
byAll Things Open
 
AI-Driven DevOps: How LLMs and Agents Are Changing Software Delivery
byAll Things Open
 
Keynote: X-rAI Specs, Submarines and Juice
byAll Things Open
 
Unconventional Backgrounds: The Secret Sauce of Diversity
byAll Things Open
 
The Missing Link to Inclusion and Performance
byAll Things Open
 
Incorporating AI Into Your SDLC: Leveraging AI tooling across the phases of y...
byAll Things Open
 
Linux Command-line Tips and Tricks - ATO 2025
byAll Things Open
 
ERG as a Bridge: Driving Inclusion in Open Source
byAll Things Open
 
AI and Linux in 2025 - Jay LaCroix, Learn Linux TV
byAll Things Open
 
What If the Quietest Person is the Smartest in the Room?
byAll Things Open
 
With AIs Wide Open… - All Things Open 2025
byAll Things Open
 
Everything You Need to Know About Running LLMs Locally
byAll Things Open
 
Rolling out Enterprise AI: Tools, Insights, and Team Empowerment
byAll Things Open
 
Tech Hiring Is Not Dead - You Just Actually Have To Try
byAll Things Open
 
Open Source Post-Quantum Cryptography - Matt Caswell
byAll Things Open
 
Big Data on a Small Budget: Scalable Data Visualization for the Rest of Us - ...
byAll Things Open
 

Recently uploaded

PDF
JR : Quality Random Data from the Command line
byGiovanni Marigi
 
PDF
Master the FME Connector for ArcGIS: Streamlined Data Management & Robust Met...
bySafe Software
 
PDF
Using Change Data Capture (CDC) to Ingest Data into Apache Kafka
byGiovanni Marigi
 
PDF
Louisville User Group: Transforming Technical Debt into Technical Wealth
byLynda Kane
 
PPTX
TechSprint Kickoff - Everything You Need to Know
bygdgcodecellcmpn
 
PDF
Scott M. Graffius' Phases of Team Development - Applied to Human Teams and Hu...
byScott M. Graffius
 
PDF
SEO in Charleston SC | Local SEO Strategies to Grow Your Business.pdf
bycustomdigitalsolutio1
 
PPTX
Software Tools for penetration Testing (1).pptx
byAmosCheruiyot13
 
PPTX
IBM_NEXA_DAC2021 NEXA, a cloud-native platform for collaborative hardware log...
byArun Joseph
 
PPTX
DATALIVA-Presentation-EN_2026 Budgeting SAP Odoo ERP
byMustafa Kuğu
 
PDF
Saga: The new era of transactions in a microservices architecture
byGiovanni Marigi
 
PDF
Presentation on Four Stroke Engine of Ic engine
bySonam Sherpa
 
PDF
DataLiva-LivaGRC- Business Software for Governance, Risk, and Compliance
byMustafa Kuğu
 
PPTX
Lecture 04. about Black heads and Hackerss.pptx
byvinocol222
 
PDF
DevOps GenAI_ How Generative AI Is Changing Software Delivery.pdf
byDevseccops.ai
 
PPTX
Lecture 05. API Security for DevSecOps Eng.pptx
byvinocol222
 
PDF
oracle_apex_tamil_export_an_application.pdf
byUthamaselvan M
 
PDF
How to Connect HP LaserJet MFP M234dwe to WiFi
byPrinter Tales
 
PDF
The CISO_Transformation_Playbook From Cost Centre to Chief Trust Officer
bysajjasridhar1990
 
PDF
The_Boardroom_Cyber_Playbook_Research_Edition
bySaraDavis91
 
JR : Quality Random Data from the Command line
byGiovanni Marigi
 
Master the FME Connector for ArcGIS: Streamlined Data Management & Robust Met...
bySafe Software
 
Using Change Data Capture (CDC) to Ingest Data into Apache Kafka
byGiovanni Marigi
 
Louisville User Group: Transforming Technical Debt into Technical Wealth
byLynda Kane
 
TechSprint Kickoff - Everything You Need to Know
bygdgcodecellcmpn
 
Scott M. Graffius' Phases of Team Development - Applied to Human Teams and Hu...
byScott M. Graffius
 
SEO in Charleston SC | Local SEO Strategies to Grow Your Business.pdf
bycustomdigitalsolutio1
 
Software Tools for penetration Testing (1).pptx
byAmosCheruiyot13
 
IBM_NEXA_DAC2021 NEXA, a cloud-native platform for collaborative hardware log...
byArun Joseph
 
DATALIVA-Presentation-EN_2026 Budgeting SAP Odoo ERP
byMustafa Kuğu
 
Saga: The new era of transactions in a microservices architecture
byGiovanni Marigi
 
Presentation on Four Stroke Engine of Ic engine
bySonam Sherpa
 
DataLiva-LivaGRC- Business Software for Governance, Risk, and Compliance
byMustafa Kuğu
 
Lecture 04. about Black heads and Hackerss.pptx
byvinocol222
 
DevOps GenAI_ How Generative AI Is Changing Software Delivery.pdf
byDevseccops.ai
 
Lecture 05. API Security for DevSecOps Eng.pptx
byvinocol222
 
oracle_apex_tamil_export_an_application.pdf
byUthamaselvan M
 
How to Connect HP LaserJet MFP M234dwe to WiFi
byPrinter Tales
 
The CISO_Transformation_Playbook From Cost Centre to Chief Trust Officer
bysajjasridhar1990
 
The_Boardroom_Cyber_Playbook_Research_Edition
bySaraDavis91
 

Version Control and Git - GitHub Workshop

  • 1.
    ! GOTTA GROK GITAll Things Open October 22, 2014
  • 2.
  • 3.
    ! Tools, processes& communication.
  • 4.
    ! How DoCommittees Invent? Melvin E. Conway Copyright 1968, F. D. Thompson Publications, Inc. Reprinted by permission of Datamation magazine, where it appeared April, 1968. That kind of intellectual activity which creates a whole from its diverse parts may be called the design of a system. Whether the particular activity is the creation of specifications for a major weapon system, the formation of a recommendation to meet a social challenge, or the programming of a computer, the general activity is largely the same. Typically, the objective of a design organization is the creation and assembly
  • 5.
    Organizations which designsystems are constrained to produce designs which are copies of the communication structures of these organizations. ! Melvin Conway
  • 6.
    ! 1968 HOWTO COMMITTEES INVENT? – DATAMATION
  • 7.
  • 8.
    ! Tools define communication.
  • 9.
  • 10.
    ! Tools define culture.
  • 11.
    ! Chris Kelly IN MEATSPACE
  • 12.
    ! @amateurhuman ONTHE INTERNET
  • 13.
  • 14.
  • 15.
    ! Productivity withbetter Git and GitHub.
  • 16.
    ! › gitadd . › git commit -m “blarg”
  • 17.
    ! Git is source control.
  • 18.
    ! Git is communication.
  • 19.
    ! Git is a debugger.
  • 20.
    ! Git is an enforcer.
  • 21.
    ! Git is automation.
  • 22.
    ! Git isn’t linear.
  • 23.
    ! Git isn’t permanent.
  • 24.
    ! Git isn’t GitHub.
  • 25.
  • 26.
  • 27.
  • 28.
  • 29.
  • 30.
    ! › gitinit Initialized empty Git repository in /Users/amateurhuman/Repos/sample/.git/
  • 31.
    ! › tree.git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── info │ └── pack └── refs ├── heads └── tags
  • 32.
    echo ‘All ThingsOpen' | git hash-object -w --stdin ! › 69053dcce790795e81715f0189874eb444283a1a
  • 33.
    ! › tree.git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── 69 │ │ └── 053dcce790795e81715f0189874eb444283a1a │ ├── info │ └── pack └── refs ├── heads └── tags
  • 34.
    › git cat-file-p 69053dcce7 All Things Open !
  • 35.
    ! › echo"MIT License" > LICENSE › git hash-object -w LICENSE d1e1072ee5e1d109c15b6fd18756aedc2a401840
  • 36.
    › git cat-file-t d1e1072ee5 blob !
  • 37.
    git update-index --add --cacheinfo 100644 d1e1072ee5e1d109c15b6fd18756aedc2a401 LICENSE ! ›
  • 38.
    ! › gitwrite-tree 1e64e3ebbaf64bd48a0e4dfb90aec69b0f32e90d
  • 39.
    git cat-file -p 1e64e3ebbaf64bd48a0e4dfb90aec69b0f32 ! › 100644 blob d1e1072ee5e1d109c15b6fd18756aedc2a401840 LICENSE
  • 40.
    ! › echo“Apache v2" > LICENSE › git update-index LICENSE › git update-index --add source.c
  • 41.
    ! › gitwrite-tree 9b1fb9441319be18f900a443db6898f43c69e577
  • 42.
    › git cat-file-p 9b1fb94413 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
  • 43.
    › git cat-file-p 5c217fa6d7 Apache v2 !
  • 44.
    echo "Initial commit"| git commit-tree 9b1fb9441319be18f900 ! › d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12
  • 45.
    git update-index --add include/header.h ! › › git write-tree 6d189a0b90cb07212e7b7aee837c90fc7595a147
  • 46.
    › git cat-file-p 6d189a0b90 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 040000 tree a2fe4c0988d4ad5b5637f09ab5874972328cb563 include 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
  • 47.
    ! echo "Addheader" | git commit-tree 6d189a -p d8a926 › 532d9258310ee0a4eefcbd52e152dbf0238d9e63
  • 48.
    ! › gitlog 532d92 commit 532d9258310ee0a4eefcbd52e152dbf0238d9e63 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:25:30 2014 -0400 Add header commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
  • 49.
    › git cat-file-p 532d9258310ee0a4eefcbd tree 6d189a0b90cb07212e7b7aee837c90fc7595a147 parent d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 author Chris Kelly <amateurhuman@gmail.com> 1413955530 -0400 committer Chris Kelly <amateurhuman@gmail.com> 1413955530 -0400 Add header !
  • 50.
    › git cat-file-p 6d189a0b90cb07212e7b7a 100644 blob 5c217fa6d7f5536f958193e9cb04a8d4db588db6 LICENSE 040000 tree a2fe4c0988d4ad5b5637f09ab5874972328cb563 include 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 source.c !
  • 51.
    › git cat-file-p a2fe4c0988d4ad5b5637f0 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 header.h !
  • 52.
    › git cat-file-p e69de29bb2d1d6434b8b29 /********************************************************************** ! header.h - $Author$ created at: Sun 10 12:06:15 Jun JST 2007 Copyright (C) 2007-2008 Yukihiro Matsumoto **********************************************************************/ #ifndef RUBY_H #define RUBY_H 1 #define HAVE_RUBY_DEFINES_H 1 #define HAVE_RUBY_ENCODING_H 1
  • 53.
    ! commit 532d92 tree 6d189a parent d8a926 author Chris committer Chris Add header tree 6d189a tree a2fe4c include blob 5c217f LICENSE blob e69de2 source.c tree a2fe4c0 blob e69de2 header.h blob e69de29 /******************** header.h - $Author$ created at: blob 5c217f Apache v2 blob e69de2 /******************** source.c -
  • 54.
  • 55.
    ! › tree.git/refs .git/refs ├── heads └── tags
  • 56.
    ! git update-ref refs/heads/master 532d92 ›
  • 57.
    ! › gitlog master commit 532d9258310ee0a4eefcbd52e152dbf0238d9e63 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:25:30 2014 -0400 Add header commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
  • 58.
    › cat .git/refs/heads/master 532d9258310ee0a4eefcbd52e152dbf0238d9e63 !
  • 59.
    ! git update-ref refs/heads/initial d8a926 ›
  • 60.
    ! › gitlog initial commit d8a9265c9c69cd401ee5a02b0bb1681f6d19cc12 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Oct 12 01:17:08 2014 -0400 Initial commit
  • 61.
    ! › tree.git .git ├── HEAD ├── config ├── description ├── hooks ├── info ├── objects │ ├── info │ └── pack └── refs ├── heads └── tags
  • 62.
    ! › gitcheckout initial › cat .git/HEAD ref: refs/heads/initial
  • 63.
    ! git update-ref refs/tags/v0.1 532d92 ›
  • 64.
    ! › tree.git/refs .git/refs ├── heads │ ├── initial │ └── master └── tags └── v0.1
  • 65.
  • 66.
    › git clonecompany/project ! company/project company/project working local remote
  • 67.
    ! › editREADME.md company/project company/project working local remote README.md
  • 68.
    ! › gitadd README.md company/project company/project working local remote README.md
  • 69.
    ! company/project ›git commit company/project working local remote README.md
  • 70.
    › git pushorigin master ! company/project company/project working local remote README.md README.md
  • 71.
    › git fetchorigin master ! company/project company/project working local remote README.md README.md edit1
  • 72.
    › git pullorigin master ! company/project company/project working local remote README.md README.md edit1 edit1 edit2 edit2
  • 73.
    git remote addupstream creator/ ! › company/project company/project working local remote creator/project
  • 74.
    ! › company/projectcompany/project working local remote creator/project git fetch upstream edit3
  • 75.
    ! › gitpush origin master company/project company/project working local remote creator/project edit3 edit3
  • 76.
    ! GitHub Flow - Fork a repository - Create a feature branch - Make your changes - Push to your fork - Create a Pull Request
  • 77.
  • 78.
    ! › gitlog commit 2f83b32f7123508239da5ed670a45e831d614ac7 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 22:36:17 2014 +0000 update doc. commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] commit 7ce520e90a2aa4fae492ecdd0cba5b4df92c9462
  • 79.
    › git show2f83b32f71235082 › git show 2f83b32f71 › git show 2f83b3 !
  • 80.
    › git show2f83b32f71235082 › git show v2.3 !
  • 81.
    › git log--pretty=format: 2f83b32 update doc. 2f00c56 * ext/date/lib/date.rb: fix indent [ci skip] 7ce520e * ext/tk/tcltklib.c: (experimental) support Tcl/Tk8.6.2. * ext/tk/extconf.450307e * enum.c (nmin_run): max(n) and max_by(n) returns an array in descending 63fa57e * 2014-10-14 1f6fa32 ChangeLog: fix a typo for r47897. f77d22d common.mk: update-gems for older BASERUBY caa54c1 Revert r47899 8d7fa22 * lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem. [Featur 22e26d3 fix typo and spaces c66506e * lib/find.rb (Find.find): Call to_path for arguments to obtain strings. ! 89322aa * common.mk: use relative load path for bundled_gems directory. [Bug #10372] 4a883ff parse.y: keep nodes linking
  • 82.
    ! › gitshow 2f00c56 commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date when Infinity; return d <=> other.d when Numeric; return d
  • 83.
    ! › gitshow HEAD^ commit 2f00c56eb78696dc30b7d218bd32f10b9e96028a Author: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 20:16:07 2014 +0000 * ext/date/lib/date.rb: fix indent [ci skip] diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date when Infinity; return d <=> other.d when Numeric; return d
  • 84.
    ! › gitshow HEAD~3 commit 450307e38315f81c10d959054c49d8baed522027 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 16:30:07 2014 +0000 2f00c56eb78696dc30b7d218bd32f10b9e96028a zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 20:16:* ext/enum.date/c (nmin_lib/date.run): rb: max(fix n) indent and max_[ci by(skip] n) returns an array in descending order. [ruby-core:65452] Suggested by David Grayson. diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index 83234f4..4268661 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -29,11 +29,11 @@ class Date diff --git a/ChangeLog b/ChangeLog index faecb02..aa563ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ when Infinity; return d <=> other.d when Numeric; return d
  • 85.
    ! › gitshow HEAD~3 commit 450307e38315f81c10d959054c49d8baed522027 Author: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon Oct 13 16:30:07 2014 +0000 * enum.c (nmin_run): max(n) and max_by(n) returns an array in descending order. [ruby-core:65452] Suggested by David Grayson. diff --git a/ChangeLog b/ChangeLog index faecb02..aa563ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ ^^^
  • 86.
    ! › gitlog master..fix commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
  • 87.
    ! › gitlog commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 ^master fix Fix text overflowing out of scroll view when soft wrapped
  • 88.
    ! › gitlog commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 fix ^master Fix text overflowing out of scroll view when soft wrapped
  • 89.
    fix --not master ! › git log commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
  • 90.
    › git logfix fix2 ^master commit 7a5dcdde4939c254f79bb737d31ed6c75117a8dd Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 11:49:12 2014 +0100 ! Breaking stuff commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped
  • 91.
    ! › gitshow 8345091 commit 834509194853859f92a40d949d83d9dc1c757cf6 Author: Chris Kelly <amateurhuman@gmail.com> Date: Wed Apr 16 14:50:26 2014 -0700 Fix text overflowing out of scroll view when soft wrapped diff --git a/stylesheets/zen.less b/stylesheets/zen.less index 5b5cf64..786ec25 100644 --- a/stylesheets/zen.less +++ b/stylesheets/zen.less @@ -14,6 +14,10 @@ width: 700px; margin: 0 auto;
  • 92.
    › git lolfix..master 36ffb49 2014-10-10 (HEAD, master) width is configurable [Chris Wanstrath] f8e758c 2014-10-10 (v0.8.0) Prepare 0.8.0 release [Chris Wanstrath] 0434992 2014-10-10 fix config names [Chris Wanstrath] 9a0f4d8 2014-10-10 (v0.7.0) Prepare 0.7.0 release [Chris Wanstrath] 4f5b8a2 2014-10-10 :lipstick: [Chris Wanstrath] e187c92 2014-10-10 Reorganize enter / exit code a bit. [Chris Wanstrath] 9265568 2014-10-10 Piggy-back on preferredLineLength in the config [Chris Wanstrath] 7da2ae0 2014-10-10 Default width to editor.preferredLineLength [Chris Wanstrath] a4c4a02 2014-10-10 Make width configurable [Chris Wanstrath] cea10c6 2014-10-10 :lipstick: [Chris Wanstrath] 6637c13 2014-10-10 Hide the TreeView so people can unhide it. [Chris Wanstrath] ! 9057633 2014-10-10 remove soft wrap testing comment [Chris Wanstrath] 0a2d244 2014-10-10 Automatically soft wrap. Closes #24 [Chris Wanstrath]
  • 93.
    ! git log origin/master..HEAD ›
  • 94.
    ! › gitlog gc.c commit a223ff83b07061fe6b7259a72041c4adcc87421b Author: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Sat Aug 30 16:29:40 2014 +0000 merge revision(s) r46387: [Backport #9607] * gc.c: change full GC timing to keep lower memory usage. Extend heap only at (1) after major GC or (2) after several (two times, at current) minor GC Details in https://bugs.ruby-lang.org/issues/9607#note-9 [Bug #9607]
  • 95.
    › git lolgc.c --since=1.month.ago 2ccf728 2014-09-23 (HEAD, origin/ruby_2_1, ruby_2_1) merge revision(s) r47696,r47697 ee69bb4 2014-09-23 merge revision(s) r47641,r47642,r47644: [Backport #10262] [nagachika] c8ec78c 2014-09-23 merge revision(s) r47683: [Backport #10281] [nagachika] 77ce45d 2014-09-23 merge revision(s) r47111,r47212,r47451,r47452,r47680: [Backpor 7693578 2014-09-23 * version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.4. [nagachika] !
  • 96.
  • 97.
  • 98.
  • 99.
  • 100.
    ! Stop working& start playing.
  • 101.
    › git status # On branch long-branch # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: lib/zen.coffee # # 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: menus/zen.cson # !
  • 102.
    › git stash Saved working directory and index state WIP on long-branch: 36ffb49 width is configurable HEAD is now at 36ffb49 width is configurable !
  • 103.
    ! › gitstatus # On branch long-branch nothing to commit, working directory clean
  • 104.
    ! › gitstash list stash@{0}: WIP on long-branch: 36ffb49 width is configurable stash@{1}: WIP on long-branch: 36ffb49 width is configurable
  • 105.
    › git stash # On branch some-other-branch # 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: lib/zen.coffee # modified: menus/zen.cson # no changes added to commit (use "git add" and/or "git commit -a") ! apopply
  • 106.
    ! › gitbranch boyscout
  • 107.
    › git resetmaster^^^ --hard HEAD is now at abcc6b1 rip staff1.rs !
  • 108.
    ! › gitcheckout boyscout Switched to branch 'boyscout'
  • 109.
    › git checkoutfix -- path/file.md !
  • 110.
    ! › gitcheckout HEAD -- README.md
  • 111.
    ! › gitcheckout -- README.md
  • 112.
    ! › gitcheckout -f master Switched to branch 'master'
  • 113.
    ! › gitreset --hard HEAD HEAD is now at bcc8845 width is configurable
  • 114.
    ! › gitreset --hard HEAD^^^ HEAD is now at 9bd382b Prepare 0.7.0 release
  • 115.
    git update-ref refs/heads/experiment bcc8845 ! ›
  • 116.
    ! › gitstatus On branch experiment Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: README.md new file: keymaps/zen.cson deleted: keymaps/zen.darwin.cson deleted: keymaps/zen.linux.cson deleted: keymaps/zen.win32.cson modified: lib/zen.coffee modified: stylesheets/zen.less
  • 117.
    ! › gitrevert 6767ce1 [experiment 54f3848] Revert "Updated README" 1 file changed, 1 insertion(+), 1 deletion(-)
  • 118.
    ! › gitrevert 54f3848 [experiment 8b7885f] Revert "Revert "Updated README"" 1 file changed, 1 insertion(+), 1 deletion(-)
  • 119.
    ! › gitrevert 54f3848 [experiment 8b7885f] IR ehvaervet "nRo eivdeerat "wUhapdt aIt'edm RdEoAiDnMgE"" 1 file changed, 1 insertion(+), 1 deletion(-)
  • 120.
    ! Diff tothe second degree.
  • 121.
    ! › ack-i zen keymaps/zen.cson 2: 'ctrl-shift-cmd-F': 'zen:toggle' 3: 'cmd-ctrl-z': 'zen:toggle' 5: 'ctrl-shift-cmd-F': 'zen:toggle' 6: 'cmd-ctrl-z': 'zen:toggle' 9: 'shift-f11': 'zen:toggle' 10: 'ctrl-shift-Z': 'zen:toggle' 12: 'shift-f11': 'zen:toggle' 13: 'ctrl-shift-Z': 'zen:toggle' 16: 'shift-f11': 'zen:toggle' 17: 'ctrl-shift-Z': 'zen:toggle' 19: 'shift-f11': 'zen:toggle' 20: 'ctrl-shift-Z': 'zen:toggle'
  • 122.
    ! find .-not -path '*/.*' -type f -exec sed -i '' s/zen/focused/ {} + ›
  • 123.
    ! › gitdiff diff --git a/keymaps/zen.cson b/keymaps/zen.cson index 3784f7c..2f53ded 100644 --- a/keymaps/zen.cson +++ b/keymaps/zen.cson @@ -1,20 +1,20 @@ '.platform-darwin .workspace': - 'ctrl-shift-cmd-F': 'zen:toggle' - 'cmd-ctrl-z': 'zen:toggle' + 'ctrl-shift-cmd-F': 'focused:toggle' + 'cmd-ctrl-z': 'focused:toggle' '.platform-darwin .workspace .editor:not(.mini)': - 'ctrl-shift-cmd-F': 'zen:toggle' - 'cmd-ctrl-z': 'zen:toggle'
  • 124.
    ! › ack-i zen lib/zen.coffee 14: fullscreen = atom.config.get 'Zen.fullscreen' 15: width = atom.config.get 'Zen.width' 21: # Enter Zen 47: # Exit Zen menus/zen.cson 6: 'label': 'Zen' package.json 2: "name": “Zen”, README.md
  • 125.
    › git stash Saved working directory and index state WIP on master: 36ffb49 width is configurable HEAD is now at 36ffb49 width is configurable !
  • 126.
    ! find .-not -path '*/.*' -type f -exec sed -i '' -e s/zen/focused/ -e s/Zen/Focused/ {} + ›
  • 127.
    ! › gitdiff stash@{0} diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. @@ -7,7 +7,7 @@ fullscreen command: - `cmd-ctrl-shift-F` on OSX - `shift-F11` on Windows and Linux.
  • 128.
    ! Committing is communicating.
  • 129.
    ! › gitcommit -m “fixed” [master f93a0fe] fixed 7 files changed, 47 insertions(+), 47 deletions(-) rewrite keymaps/zen.cson (60%)
  • 130.
    ! › gitshow HEAD commit f93a0fe0833d22d1c045e323b5e4aab22b25f4ee Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 13:26:58 2014 +0100 fixed diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused
  • 131.
    ! › gitreset HEAD^ Unstaged changes after reset: M README.md M keymaps/zen.cson M lib/zen.coffee M menus/zen.cson M package.json M spec/zen-spec.coffee M stylesheets/zen.less
  • 132.
    ! › gitcommit 1 2 # Please enter the commit message for your changes. Lines starting 3 # with '#' will be ignored, and an empty message aborts the commit. 4 # On branch master 5 # Your branch is ahead of 'origin/master' by 29 commits. 6 # (use "git push" to publish your local commits) 7 # 8 # Changes to be committed: 9 # (use "git reset HEAD <file>..." to unstage) 10 # 11 #>......modified: README.md 12 #>......modified: keymaps/zen.cson 13 #>......modified: lib/zen.coffee Rename package to Focused There is already a package in the Atom packages named Zen. Even though the existing package only outputs haiku-on-command, the owner is a friend. This patch replaces all instances of 'zen|Zen' with 'focused|Focused'. If you don't like the name, you can pick a new one and run: find . -not -path '*/.*' -type f -exec sed -i '' -e s/zen/focused/ -e s/Zen/Focused/ {} +
  • 133.
    › git format-patch-n HEAD^ From d0f5920b3a27f2152394571cf2b1f82f118cd1fe Mon Sep 17 00:00:00 2001 From: Chris Kelly <amateurhuman@gmail.com> Date: Thu, 13 Oct 2014 13:30:56 +0100 Subject: [PATCH 1/1] Rename package to Focused There is already a package in the Atom packages named Zen. Even though the existing package only outputs haiku-on-command, the owner is a friend. This patch replaces all instances of 'zen|Zen' with 'focused|Focused'. If you don't like the name, you can pick a new one and run: find . -not -path '*/.*' ! -type f -exec sed -i ''
  • 134.
    ! › gitadd -p diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]?
  • 135.
    ! › ? y - stage this hunk n - do not stage this hunk q - quit; do not stage this hunk nor any of the remaining ones / - search for a hunk matching the given regex J - leave this hunk undecided, see next hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk ? - print help
  • 136.
    › git commit-m "Callback [master 1953833] Callback handler fixed 2 files changed, 12 insertions(+), 12 deletions(-) !
  • 137.
    ! › gitlog commit 4e05bc85139f0fceb2e1e60ec3b6732cc38e9f3f Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 14:08:55 2014 +0100 Rename main function commit 19538336d7c63097fc865f7b017c48c5b5e93d8d Author: Chris Kelly <amateurhuman@gmail.com> Date: Thu Oct 13 14:08:35 2014 +0100 Callback handler fixed commit df9df8a911477becd723e813f564e023c11641a8
  • 138.
    ! › gitrebase -i HEAD~4 [detached HEAD b442281] Rename package to Focused 7 files changed, 46 insertions(+), 46 deletions(-) rewrite keymaps/zen.cson (60%) Successfully rebased and updated refs/heads/master. 1 # pick This e8f500d is a combination Fix order of of specs 2 commits. 2 # squash pick The 6017931 first 6017931 commit's Styles Styles tweaked message tweaked is: 3 pick 63a108c Callback handler fixed 4 pick squash Fix order eb4f7b9 eb4f7b9 of Rename specs Rename main main function function 5 6 # Update Rebase function 36ffb49..eb4f7b9 onto 36ffb49 7 # 8 # Styles Commands: tweaked 9 # p, pick = use commit 10 Rename # r, reword main function = use commit, but edit the commit message 11 # e, edit = use commit, but stop for amending 12 # This s, squash is the = 2nd use commit commit, message: but meld into previous commit 13 # f, fixup = like "squash", but discard this commit's log message
  • 139.
    ! › gitrebase --abort
  • 140.
    ! › gitcommit --amend 1 FIx typo 2 3 # Please enter the commit message for your changes. Lines starting 4 # with '#' will be ignored, and an empty message aborts the commit. 5 # On branch master 6 # Your branch is ahead of 'origin/master' by 27 commits. 7 # (use "git push" to publish your local commits) 8 # 9 # Changes to be committed: 10 # (use "git reset HEAD^1 <file>..." to unstage) 11 # 12 #>......modified: README.md
  • 141.
    ! Bisect for debugging.
  • 142.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu]  7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn]  method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu]
  • 143.
    ! › gitbisect start › git bisect bad › git bisect good v2.3
  • 144.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect start
  • 145.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad
  • 146.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good v3.2 Bisecting: 36 revisions left !
  • 147.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad Bisecting: 18 revisions left !
  • 148.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good Bisecting: 9 revisions left !
  • 149.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect bad Bisecting: 4 revisions left !
  • 150.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect good 1779f77 is first bad commit !
  • 151.
    a98e343 2013-12-17 vm_trace.c:isolate exceptions [nobu] 8859ff1 2013-12-17 configure.in: add $CPPFLAGS [nobu] 2f346cb 2013-12-17 configure.in: use $DTRACE [nobu] ef9ea04 2013-12-17 configure.in: move opt-dir option [nobu] 5ea9849 2013-12-17 gc.c: prototype [nobu] 7a24660 2013-12-17 Makefile.in, configure.in: cppflags [nobu] 7c51c8f 2013-12-17 configure.in: build probes with systemtap's dtrace wrapper [tmm1] e80f2c1 2013-12-16 * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems repackagers to disable backward-compatible shared gem directory behavior. * test/rubygems: 45c858d 2013-12-16 * 2013-12-17 [svn] 14e213c 2013-12-16 * NEWS (RDoc): Update version number so I don't have to change it for the final release. [drbrain] 26e425e 2013-12-16 hash.c: typo [nobu] 4210568 2013-12-16 fix typos [kazu] 9931920 2013-12-16 * NEWS: mention about Hash#reject. [nobu] 0988148 2013-12-16 hash.c: warnings in rb_hash_reject [nobu] 6cd0d06 2013-12-16 hash.c: refactor loop [nobu] 62c7356 2013-12-16 test_process.rb: fix for 32bit platforms [nobu] c560193 2013-12-16 class.c: fix option hash [nobu] 5515c56 2013-12-16 test_io.rb: IO.write test [nobu] 9ae9f7c 2013-12-16 * gc.c (rb_objspace_markable_object_p): should check special_const_p first (by is_markable_object()). [ko1] d4f80bd 2013-12-16 * ext/objspace/objspace.c (reachable_object_from_root_i): use compare_by_identity hash to avoid hash modify problem during iteration. [Bug #9252] * ext/objspac 295fe99 2013-12-16 * sample/exyacc.rb: Fix typo in a variable name [a_matsuda] f89bd95 2013-12-16 * remove trailing spaces. [nobu] 8d254db 2013-12-16 * gc.c (gc_verify_internal_consistency): should not use rb_objspace_each_objects() because it call rest_sweep(). [ko1] 1a209e4 2013-12-16 * gc.c (rb_objspace_markable_object_p): fix last commit (build error). [ko1] 1779f77 2013-12-16 * gc.c (rb_objspace_markable_object_p): it should be live objects. [ko1] 60b7bd2 2013-12-16 * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. [ko1] d8eb7f3 2013-12-16 * vm_method.c (rb_method_entry_make): fix WB miss. Note that rb_method_entry_t::klass is not constified. We may constify this field. * test/ruby/test_alias.rb: c3405de 2013-12-16 * ChangeLog: [DOC] Fix typo [a_matsuda] 4fcdce3 2013-12-16 * remove trailing spaces. [nobu] c979a67 2013-12-16 * gc.c: use gc_verify_internal_consistency() instead of gc_check_before_marks_i() for check consistency on RGENGC_CHECK_MODE >= 2. [ko1] 2a73294 2013-12-16 * process.c (make_clock_result): add :second as a unit for Process.clock_gettime. [naruse] b7cbdcc 2013-12-16 suppress warning: SAFE=3 does no sandboxing [naruse] dfa892a 2013-12-16 * gc.c: introduce GC.verify_internal_consistency method to verify GC internal data structure. Now this method only checks geneartion (old/young) consistency. [ko d87de08 2013-12-16 typo: wheb -> when [tmm1] ef6c90f 2013-12-16 * 2013-12-16 [svn] 99df7a1 2013-12-16 gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0 [tmm1] 0e52301 2013-12-15 test_logger.rb: fix system dependent test [nobu] 0bb4934 2013-12-15 test_dir.rb: fix system dependent test [nobu] 1448b0a 2013-12-15 * ext/objspace/objspace.c (reachable_object_from_root_i): reachable objects should not include categories and 6c9a3cb 2013-12-15 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it causes SystemStackError for bundler [drbrain] ! b3348dd 2013-12-14 envutil.rb: reduce wait [nobu] b464418 2013-12-14 test_process.rb: handshake [nobu] › git bisect reset
  • 152.
    Cleanliness is nextto Godliness. !
  • 153.
    ! › gitbranch --merged fix-soft-wrapped-text-overflow rename-package * master
  • 154.
    › git branch--no-merged ! long-running-branch experiment-that-failed hot-fix
  • 155.
    ! › gitbranch -d hot-fix error: The branch 'hot-fix' is not fully merged. If you are sure you want to delete it, run 'git branch -D hot-fix'.
  • 156.
    ! git branch--merged | grep -v "*" | xargs -n 1 git branch -d && git push origin --delete ›
  • 157.
    git remote pruneorigin --dry-run ! › long-running-branch experiment-that-failed hot-fix
  • 158.
    Laziness is nextto Godliness. !
  • 159.
    ! › gitcommit -m “Fixes #42” Fix, Fixes, Fixed Close, Closes, Closed Resolve, Resolves, Resolved
  • 160.
    ! git commit-m “Fixes defunkt/zen#42” ›
  • 161.
    ! git commit-m “Update README [ci skip]” ›
  • 162.
    › git status # On branch master # Your branch is ahead of 'origin/master' by 26 commits. # (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: README.md # modified: keymaps/zen.cson # modified: lib/zen.coffee # modified: menus/zen.cson # modified: package.json !
  • 163.
    ! › gitstatus -sb ## master...origin/master [ahead 26] M README.md M keymaps/zen.cson M lib/zen.coffee M menus/zen.cson M package.json M spec/zen-spec.coffee M stylesheets/zen.less
  • 164.
    ! git config--global alias.st 'status -sb' ›
  • 165.
    › git status # On branch master # Your branch is ahead of 'origin/master' by 26 commits. # (use "git push" to publish your local commits) # # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README.md # # 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) !
  • 166.
    ! › gitdiff --staged diff --git a/README.md b/README.md index 945bbd4..6ccb26a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zen +# Focused Distraction free writing for Atom. @@ -7,7 +7,7 @@ fullscreen command: - `cmd-ctrl-shift-F` on OSX - `shift-F11` on Windows and Linux.
  • 167.
    ! git config--global alias.ds 'diff --staged‘ ›
  • 168.
    ! ~/Repos/zen/ onmaster* with unpushed [(03:10 PM) amateurhuman@tillandisa] ›
  • 169.
    ! ~/Repos/zen/ onmaster* with unpushed [(03:10 PM) amateurhuman@tillandisa] › git_branch() { echo $(/usr/bin/git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'}) }
  • 170.
    ! ~/Repos/zen/ onmaster* with unpushed [(03:10 PM) amateurhuman@tillandisa] › git_dirty() { st=$(/usr/bin/git status 2>/dev/null | tail -n 1) if [[ $st == "" ]] then echo "" else if [[ $st == "nothing to commit, working directory clean" ]] then echo "on %{$fg[green]%}$(git_prompt_info)%{$reset_color%}" else echo "on %{$fg[yellow]%}$(git_prompt_info)*%{$reset_color%}" fi fi }
  • 171.
    ! ~/Repos/zen/ onmaster* with unpushed [(03:10 PM) amateurhuman@tillandisa] › unpushed () { /usr/bin/git cherry -v origin/$(git_branch) 2>/dev/null } need_push () { if [[ $(unpushed) == "" ]] then echo " " else echo " with %{$fg[magenta]%}unpushed%{$reset_color%} " fi }
  • 172.
  • 173.
  • 174.
  • 175.
  • 176.
  • 177.
    ! - fuzzymatch a file - switch branches - highlight line number(s) - get the permanent url t w l y HTTPS://HELP.GITHUB.COM/ARTICLES/USING-KEYBOARD-SHORTCUTS
  • 178.
    ! Let themachines do the work.
  • 179.
  • 180.
  • 181.
  • 182.
  • 183.
  • 184.
    ! Real teams communicate.
  • 185.
  • 186.
  • 187.
  • 188.
  • 189.
  • 190.
  • 191.
    ! Git is there to help.
  • 192.
    ! Git is your friend.
  • 193.
    Git is sometimes your drunk friend. !
  • 194.
  • 195.
  • 196.