Skip to content

Instantly share code, notes, and snippets.

@mitchellh
mitchellh / merge_vs_rebase_vs_squash.md
Last active May 30, 2024 19:28
Merge vs. Rebase vs. Squash

I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who says any particular strategy is the right answer 100% of the time is wrong, but I think there is considerable acceptable leeway in when you use each. What follows is my personal and professional opinion:

@emorydunn
emorydunn / led_strip_1.yaml
Last active April 11, 2024 12:23
Sonoff L1 ESPHome Component
esphome:
name: led_strip_1
platform: ESP8266
board: esp8285
includes:
- custom_components/sonoff_l1.h
wifi:
@StevenACoffman
StevenACoffman / fluent-filebeat-comparison.md
Last active April 2, 2024 22:34
Fluentd Fluent-bit FileBeat memory and cpu resources

Fluent-bit rocks

A short survey of log collection options and why you picked the wrong one. 😜

Who am I? Where am I from?

I'm Steve Coffman and I work at Ithaka. We do JStor (academic journals) and other stuff. How big is it?

Number what it means
101,332,633 unique visitors in 2017
@happymcplaksin
happymcplaksin / gist:4073601
Last active January 3, 2024 09:08
Find VMware objects via rbvmomi
# Return all objects which match one of the types. types can be a
# string or an array
#
# For example:
# find_all(vim,'VirtualMachine')
def find_all(vim,types,startobj=vim.rootFolder)
# Allow types to be a string or an array.
types = [types].flatten
return vim.serviceContent.viewManager.CreateContainerView({:container => startobj, :type => types, :recursive => true}).view
end