Skip to content

Instantly share code, notes, and snippets.

View trailjeep's full-sized avatar
💭
¯\_(ツ)_/¯

trailjeep

💭
¯\_(ツ)_/¯
View GitHub Profile

If you are like me you find yourself cloning a repo, making some proposed changes and then deciding to later contributing back using the GitHub Flow convention. Below is a set of instructions I've developed for myself on how to deal with this scenario and an explanation of why it matters based on jagregory's gist.

To follow GitHub flow you should really have created a fork initially as a public representation of the forked repository and the clone that instead. My understanding is that the typical setup would have your local repository pointing to your fork as origin and the original forked repository as upstream so that you can use these keywords in other git commands.

  1. Clone some repo (you've probably already done this step).

@trailjeep
trailjeep / Custom CSS.css
Created March 6, 2024 14:29 — forked from TaylanTatli/Custom CSS.css
Miniflux Custom CSS
:root {
--font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--body-color: rgba(255, 255, 255, 0.7);
--body-background: #282c34;
--header-link-color: #9b9494;
--header-active-link-color: #d19a66;
--input-border: 1px solid #2c384e;
--input-background: #2c384e;
--input-placeholder-color: #888;
--input-focus-border-color: #d19a66;
@trailjeep
trailjeep / Roku Secret Menus.md
Last active January 23, 2024 11:40 — forked from kgust/Roku Secret Menus.md
Roku Secret Menus

Here is a list of currently-working secret menus, though new ones are discovered often:

Home x5 + FF x 3 + RW x 2
Secret screen one (factory reset, USB test, cycle channel store, update server/software, enable debug)
Home x 5 + U + R + D + L + U
Secret screen two (cycle screenshot, cycle ad-banner, remote auto-pair, log theme info)
Home x 5 + U + D + U + D + U
Wi-Fi secret screen
Home x 5 + FF + PP + RW + PP + FF
@trailjeep
trailjeep / RandomNicknames.swift
Created December 20, 2022 21:28 — forked from LutfiTekin/RandomNicknames.swift
Including 1124 adjectives and 4554 nouns | English
//
// RandomNames.swift
//
// Created by Lütfi Tekin on 27.12.2017.
//
class RandomNickNames{
static let adjectiveList = ["aback","abaft","abandoned","abashed","aberrant","abhorrent","abiding","abject","ablaze","able","abnormal","aboard","aboriginal","abortive","abounding","abrasive","abrupt","absent","absorbed","absorbing","abstracted","absurd","abundant","abusive","acceptable","accessible","accidental","accurate","acid","acidic","acoustic","acrid","actually","ad","hoc","adamant","adaptable","addicted","adhesive","adjoining","adorable","adventurous","afraid","aggressive","agonizing","agreeable","ahead","ajar","alcoholic","alert","alike","alive","alleged","alluring","aloof","amazing","ambiguous","ambitious","amuck","amused","amusing","ancient","angry","animated","annoyed","annoying","anxious","apathetic","aquatic","aromatic","arrogant","ashamed","aspiring","assorted","astonishing","attractive","auspicious","automatic","available","average","awake","aware","awesome","awful","axiomatic","bad","barbarou
@trailjeep
trailjeep / ics2txt.awk
Last active September 13, 2021 23:52 — forked from codedot/ics2tc.awk
Awk script that converts iCalendar .ics files to pipe "|" separated values for further processing
# Adapted from [codedot/ics2tc.awk](https://gist.github.com/codedot/1cce55b4fd354b470becb8ce341b6598)
# Parse ics to pipe seperated values for further processing
# pass in vars (-v from=remove entries before this date) (-v source=add string so i know source from multiple ics's)
function parse(dt) {
Y = substr(dt, 1, 4);
M = substr(dt, 5, 2);
D = substr(dt, 7, 2);
h = substr(dt, 10, 2);
m = substr(dt, 12, 2);
@trailjeep
trailjeep / .gitconfig
Created March 27, 2019 18:03 — forked from tomster/.gitconfig
An example git configuration including convenience aliases, some saner default behavior, a neat shell prompt and tab completion that can display the name of the tracking remote
# ~/.gitconfig
[branch]
autosetupmerge = true
[push]
default = current
[core]
excludesfile = .gitignore
@trailjeep
trailjeep / bash_template.sh
Created February 1, 2019 19:20 — forked from bertvv/bash_template.sh
Simple Bash script template
#!/usr/bin/env bash
#
# Script name -- purpose
#
# Author:
set -o errexit # abort on nonzero exitstatus
set -o nounset # abort on unbound variable
#
@trailjeep
trailjeep / README-Template.md
Last active February 1, 2019 23:16 — forked from PurpleBooth/README-Template.md
A template to make good README.md

Project Title

One Paragraph of project description goes here

Description

Describe in detail functions of the code.

Prerequisites