rerere = reuse recorded resolution
它会让Git记住你是如何解决某个文件的两个版本之间的conflict,这样在下次Git遇到同样的文件在相同的两个版本间发生冲突时,可以自动帮你使用相同的方法解决冲突。
git config --global rerere.enabled true
或是
const webpack = require('webpack'); | |
const HtmlWebpackPlugin = require('html-webpack-plugin') | |
const webpackConfig = { | |
mode: 'development', | |
devtool: 'cheap-module-source-map', | |
entry: { | |
index: process.cwd() + '/src/index' | |
}, | |
output: { |
splitChunks: { | |
cacheGroups: { | |
commons: { | |
test: /[\\/]node_modules[\\/]/, | |
name: 'vendor', | |
chunks: 'all', | |
}, | |
}, | |
}, |
https://h5.m.jd.com/dev/3CMQyf7ZmW5DZ1zssth4Q6Vhnedr/index.html#none |
<!DOCTYPE html> | |
<html> | |
<head> | |
<meta charset="utf-8" /> | |
<title>WebSocket Test</title> | |
<script language="javascript" type="text/javascript"> | |
var wsUri = "ws://echo.websocket.org/"; | |
var output; | |
function init() { |
/** | |
* Version: 1.0 Alpha-1 | |
* Build Date: 13-Nov-2007 | |
* Copyright (c) 2006-2007, Coolite Inc. (http://www.coolite.com/). All rights reserved. | |
* License: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. | |
* Website: http://www.datejs.com/ or http://www.coolite.com/datejs/ | |
*/ | |
Date.CultureInfo={name:"en-US",englishName:"English (United States)",nativeName:"English (United States)",dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbreviatedDayNames:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],shortestDayNames:["Su","Mo","Tu","We","Th","Fr","Sa"],firstLetterDayNames:["S","M","T","W","T","F","S"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],abbreviatedMonthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],amDesignator:"AM",pmDesignator:"PM",firstDayOfWeek:0,twoDigitYearMax:2029,dateElementOrder:"mdy",formatPatterns:{shortDate:"M/d/yyyy", |
<FilesMatch "\.(html|htm|js|css)$"> | |
FileETag None | |
<ifModule mod_headers.c> | |
Header unset ETag | |
Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" | |
Header set Pragma "no-cache" | |
Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" | |
</ifModule> | |
</FilesMatch> |
查看当前系统中占用物理内存最多的进程
watch -n 10 "ps -eo pid,user,%cpu,%mem,rss,vsz,sz,comm,args | sort -k5 -n -r |head -15"
查看磁盘IO
iostat -d -x -h xvda 2
创建用户 | |
CREATE USER name WITH PASSWORD pass; | |
创建数据库 | |
CREATE DATABASE name OWNER username; | |
删除数据库 | |
DROP DATABASE dbname; |
deployer_username='deployer' | |
deploy_ssh_pubkey='' | |
db_name='bisaikong' | |
db_username='bisaikong' | |
db_password='bisaikong' | |
# 安装软件包 | |
export DEBIAN_FRONTEND=noninteractive | |
apt-get -y update | |
apt-get -y install curl git-core python-software-properties |