Git GitHub & secrets

Size: px

Start display at page:

Download "Git GitHub & secrets"

Garey Pearson
6 years ago
Views:

1 Git&GitHub secrets

3 git branch -D local-branch git push origin :local-branch

4 Much like James Cameron s Avatar, Git doesn t make any goddamn sense

5 This talk throws a ton of stuff at you

6 This talk throws a ton of stuff at you (Not unlike James Cameron s Avatar, btw)

7 Learn the bits that make you more productive

10 Git&GitHub secrets

11 merge strategies

12 merge strategies strategy defaults: one head: recursive multiple heads: octopus

13 merge strategies git merge master -s strategy

14 merge strategies git merge master -s ours

15 merge strategies git merge master -s ours Give me master, but my final state should match my current branch

16 merge strategies git merge master -s ours Great for when your long-running branch will supersede master

17 merge strategies git merge master \ -s recursive

18 merge strategies git merge master \ -s recursive -X patience Better line matching for logical groups

19 merge strategies patience { :a => :b }

20 merge strategies patience { :a => :b } { :c => :d }

21 merge strategies patience { :a => :b +} + +{ + :c => :d }

22 merge strategies patience { :a => :b } +{ + :c => :d +}

23 merge strategies git merge master \ -s recursive -X patience Can also set as a global option

24 merge strategies man git-merge # look at Merge Strategies

25 The second-order-diff trick

26 the second-order-diff trick Tom Moertel ( cl.ly/qnag )

27 the second-order-diff trick Goal: transform strings with a regex in project

28 the second-order-diff trick Approach: re-run git diff and git reset until the regex is correct

29 the second-order-diff trick Problem: it sucks to review the diff each time

30 the second-order-diff trick Solution: stash, then diff against stash{0}

31 the second-order-diff trick git status # clean

32 the second-order-diff trick./run-regex-script

33 the second-order-diff trick git diff # review and check output

34 the second-order-diff trick git stash # stash your reviewed diff

35 the second-order-diff trick./run-regex-script

36 the second-order-diff trick git diff stash{0} # only incremental changes

37 the second-order-diff trick Find and replace in projects without worrying

38 emoji diffs

39 emoji diffs Yeah this is important

40 emoji diffs Git diffs unicode poorly:

41 emoji diffs

42 emoji diffs Git uses less as its pager

43 emoji diffs git --no-pager diff

44 emoji diffs

45 emoji diffs

46 emoji diffs

47 emoji diffs

48 git stripspace

49 git stripspace Fixes horrible coworkers and contributors

50 git stripspace Strips trailing whitespace, collapses newlines, adds a final newline

51 git stripspace git stripspace < file

52 git stripspace echo hi \n git stripspace

53 git stripspace Run this in your editor after file saves

54 git diff --check

55 git diff --check Fixes horrible you.

56 git diff --check run.sh:1: trailing whitespace. +echo hi.

57 git diff --check run.sh:1: space before tab in indent. + ls -la

58 git diff --cached

59 git diff --cached git diff only diffs unstaged changes

60 git diff --cached Shows staged (but uncommitted) changes

61 HOT, HOT, TRIVIA BREAK

62 Which of these commit messages actually happened on GitHub?

63 1. A reasoned argument, citing sources 2. A 500MB db dump

64 1. A reasoned argument, citing sources 2. A 500MB db dump

65 Why is my repository slow?

66 git merge --abort

67 git merge --abort Aborts a conflicted merge

68 git merge --abort Resets your tree

69 git merge -m message

70 git merge -m Like commit -m but populates the merge commit

71 git merge --no-commit

72 git merge --no-commit Merges without a commit message

73 git status --ignored

74 git status --ignored Shows the status of everything you re ignoring

75 --assume-unchanged

76 --assume-unchanged Temporarily ignore a file

77 --assume-unchanged git update-index \ --assume-unchanged \ path_to_file

78 --assume-unchanged git update-index \ --no-assume-unchanged \ path_to_file

79 proper messages

80 proper messages Linus has thoughts on your commit messages

81 proper messages git commit -m fixes shit

82 proper messages git commit -m fixes shit is not what he had in mind

83 proper messages A good commit has:

84 proper messages Short summary (title) A longer description of the change follows.

85 proper messages Short summary (title) < 50c

86 proper messages Short summary (title) < 50c A longer description of the change follows.

87 proper messages Short summary (title) < 50c A longer description of the change follows. wrap at 72c

88 proper messages

89 proper messages git-commit helps you write perfect messages

90 proper messages

91 proper messages 50c

92 proper messages

93 proper messages wraps at 72c

94 proper messages Assumes your $EDITOR is vim

95 proper messages export EDITOR=vim

96 proper messages Assumes you have syntax highlighting on

97 proper messages syntax on ~/.vimrc

98 proper messages Assumes you have plugin indenting on

99 proper messages filetype indent plugin on ~/.vimrc

100 Git&GitHub secrets

101 canonical URLs

102

103

104 press y

105 press y

106 y This page won t change, even if the branch does

107 curlable public keys

108 / holman.keys

109 / user.keys Plaintext, non-authed access to public keys

110 / user.keys Programmatically add SSH keys

111 fetching pulls

112 fetching pulls Accepting a Pull Request: Add a remote, fetch branch, merge

113 fetching pulls Lots of boring commands

114 fetching pulls GitHub stores all Pull Requests in your repository

115 fetching pulls This means we can track code even if the fork is deleted

116 fetching pulls You can abuse this, too!

117 fetching pulls git fetch origin pull/id/head:name

118 fetching pulls git fetch origin pull/12/head:pr

119 fetching pulls git fetch origin pull/12/head:pr fetches Pull Request #12 into a branch named pr

120 fetching pulls Automate this within helper scripts or an alias

121 live updates

122

123

124

125

126 HOT, HOT, TRIVIA BREAK

127 Most frequent Emoji used on GitHub:

128 #5 :clap:

129 #4 :+1:

130 #3 :-1:

131 #2 :sparkles:

132 #1 :shipit:

133 quick quotes

134 quick quotes Markdown uses >. for blockquotes

135 quick quotes

136 quick quotes Highlight and press. r

137 quick quotes

138 quick quotes

139 browse stars

140 / stars / brianmario

141

142 web flow

143 web flow You can do a lot without leaving the browser

144 web flow Documentation, prose, quick fixes, switching away from nosql

145 web flow

146 web flow

147 web flow

148 web flow

149 web flow

150 web flow

151 web flow Frees you from git clone

152 issue autocomplete

153 issue autocomplete Type #, get a search

154

155

156

157

158 repo redirects

159 repo redirects Rename your repository and GitHub will redirect old URLs

160 in-repo licensing

161

162 in-repo licensing You can add licenses to existing repos, too

163 in-repo licensing

164 in-repo licensing

165 in-repo licensing (also works for.gitignore)

166 file finder

167 file finder Type t, find in project

168 file finder

169 task lists

170 task lists Use issues and pulls as todo lists

171 task lists - [ ] Use NoSQL - [ ] Use today's trendiest language - [ ] Do what our VC tells us - [ ] Comment on Hacker News - [ ] Profit

172 task lists

173 task lists

174 task lists - [x] Use NoSQL - [x] Use today's trendiest language - [x] Do what our VC tells us - [x] Comment on Hacker News - [ ] Profit

175 task lists

176 fork URLs

177 fork URLs

178

179 fork URLs / user / repo / fork

180

181 fork URLs README links

182 fork URLs

183 Remember:

184 Git is probably terrible

185 But it s also neato

186 Thanks!

git Version: 2.0b Merge combines trees, and checks out the result Pull does a fetch, then a merge If you only can remember one command:

git Version: 2.0b Merge combines trees, and checks out the result Pull does a fetch, then a merge If you only can remember one command: Merge combines trees, and checks out the result Pull does a fetch, then a merge If you only can remember one command: git --help Get common commands and help git --help How to use git