mitchellh

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:

swinton

Verified commits made easy with GitHub Actions

So you want to commit changes generated by a GitHub Actions workflow back to your repo, and have that commit signed automatically?

Here's one way this is possible, using the REST API, the auto-generated GITHUB_TOKEN, and the GitHub CLI, gh, which is pre-installed on GitHub's hosted Actions runners.

You don't have to configure the git client, just add a step like the one below... Be sure to edit FILE_TO_COMMIT and DESTINATION_BRANCH to suit your needs.

benawad

" Specify a directory for plugins
call plug#begin('~/.vim/plugged')

Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'scrooloose/nerdtree'
"Plug 'tsony-tsonev/nerdtree-git-plugin'
Plug 'Xuyuanp/nerdtree-git-plugin'
Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
Plug 'ryanoasis/vim-devicons'
Plug 'airblade/vim-gitgutter'

prantoran

package main

import (
	"context"
	"fmt"
	"log"
	"net/http"
	"os"
	"os/signal"
	"time"

jofftiquez

const mock = (success, timeout = 1000) => {
  return new Promise((resolve, reject) => {
    setTimeout(() => {
      if(success) {
        resolve();
      } else {
        reject({message: 'Error'});
      }
    }, timeout);
  });

joe94

package main

import (
	"fmt"
	"io"
	"os"
)

var path = "/Users/novalagung/Documents/temp/test.txt"

mrlesmithjr

---
- name: Install MacOS Packages
  hosts: localhost
  become: false
  vars:
    brew_cask_packages:
      - atom
      - docker
      - dropbox
      - firefox

ankurk91

Github : Signing commits using GPG (Ubuntu/Mac) 🔐

• Do you have an Github account ? If not create one.
• Install required tools
• Latest Git Client
• gpg tools

# Ubuntu
sudo apt-get install gpa seahorse
# MacOS with https://brew.sh/

alopresto

If anyone is interested in setting up their system to automatically (or manually) sign their git commits with their GPG key, here are the steps:

1. Generate and add your key to GitHub
2. $ git config --global commit.gpgsign true ([OPTIONAL] every commit will now be signed)
3. $ git config --global user.signingkey ABCDEF01 (where ABCDEF01 is the fingerprint of the key to use)
4. $ git config --global alias.logs "log --show-signature" (now available as $ git logs)
5. $ git config --global alias.cis "commit -S" (optional if global signing is false)
6. $ echo "Some content" >> example.txt
7. $ git add example.txt
8. $ git cis -m "This commit is signed by a GPG key." (regular commit will work if global signing is enabled)

t-mart

Map	Action
<F1>	Causes Netrw to issue help
<cr>	Netrw will enter the directory or read the file
<del>	Netrw will attempt to remove the file/directory
-	Makes Netrw go up one directory
a	Toggles between normal display, hiding (suppress display of files matching g:netrw_list_hide) showing (display only files which match g:netrw_list_hide)
c	Make browsing directory the current directory
C	Setting the editing window
d	Make a directory