tmaybe

How to Ignore Merge Conflicts for Specific Files in a Git Repository

Create a directory and git init it

$ mkdir merge-test
$ cd merge-test/
$ git init

sebz

How to implement a custom search for Hugo usig Gruntjs and Lunrjs.

Requirements

Install the following tools:

• Nodejs
• Gruntjs

Setup

imjasonh

* {
    font-size: 12pt;
    font-family: monospace;
    font-weight: normal;
    font-style: normal;
    text-decoration: none;
    color: black;
    cursor: default;
}

drkarl

Linux Backup Solutions

I've been looking for the best Linux backup system, and also reading lots of HN comments.

Instead of putting pros and cons of every backup system I'll just list some deal-breakers which would disqualify them.

Also I would like that you, the HN community, would add more deal breakers for these or other backup systems if you know some more and at the same time, if you have data to disprove some of the deal-breakers listed here (benchmarks, info about something being true for older releases but is fixed on newer releases), please share it so that I can edit this list accordingly.

Amanda (comments by sammcj)

• It has a lot of management overhead and that's a problem if you don't have time for a full time backup administrator.

progrium

curl -s "$url" | tar -zxC "$dest"

blabber

// ==UserScript==
// @name        RaumZeitDeponifier
// @namespace   http://gist.github.com/040c9009cfcb443d1d92
// @description Removes images from RZL blogposts which are likely to contain ponies
// @include     http://raumzeitlabor.de/
// @include     http://raumzeitlabor.de/blog/*
// @include     https://raumzeitlabor.de/
// @include     https://raumzeitlabor.de/blog/*
// @version     2
// @grant       none

softwaredoug

#include "stdio.h"
#include "stdlib.h"

unsigned int max(unsigned int a, unsigned int b) {
    return a > b ? a : b;
}

unsigned int bucket(unsigned int val) {
    return val & 0xF0000000 >> 28;
}

tuxfight3r

##TCP FLAGS##

Unskilled Attackers Pester Real Security Folks
==============================================
                     TCPDUMP FLAGS
Unskilled =  URG  =  (Not Displayed in Flag Field, Displayed elsewhere) 
Attackers =  ACK  =  (Not Displayed in Flag Field, Displayed elsewhere)
Pester    =  PSH  =  [P] (Push Data)
Real      =  RST  =  [R] (Reset Connection)
Security  =  SYN  =  [S] (Start Connection)

zakx

#!/usr/bin/python2

# setup: pip install requests beautifulsoup4

from decimal import Decimal
import requests
from bs4 import BeautifulSoup
import sys

# Session setup

pghalliday

#!/bin/bash
set -e

# Deploy built site to this branch
TARGET_BRANCH=master
# Sync the contents of this directory where the site should have been built
SOURCE_DIR=_site

if [ ! -d "$SOURCE_DIR" ]; then
  echo "SOURCE_DIR ($SOURCE_DIR) does not exist, build the source directory before deploying"