vpetruchok

# 3-way merge style
git config merge.conflictstyle diff3

# 2-way merge style (by default)
git config merge.conflictstyle merge

vpetruchok

From [https://git-scm.com/docs/git-diff] ([https://git-scm.com/docs/git-diff):

--word-diff= plain:

Show words as [-removed-] and {+added+}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

Examples:

• git diff --word-diff=plain

vpetruchok

IntelliJ Idea Live Templates

• main

  public static void main(String[] args){
      $END$
  }

• printf

vpetruchok

Structural search

Find classes with the main method:

public static void main(String[] $param$);

vpetruchok

psql connection parameters

Parameter name	Command line argurment	Environment variable
Database name	-d database	$PGDATABASE
Hostname	-h host	$PGHOST
Port	-p port	$PGPORT
User name	-U username	$PGUSER

Usefull settings

vpetruchok

# from https://superuser.com/questions/880213/automatically-export-history-at-end-of-powershell-session
$HistoryFilePath = Join-Path ([Environment]::GetFolderPath('UserProfile')) .ps_history
Register-EngineEvent PowerShell.Exiting -Action { Get-History | Export-Clixml $HistoryFilePath } | out-null
if (Test-path $HistoryFilePath) { Import-Clixml $HistoryFilePath | Add-History }

vpetruchok

# from http://stackoverflow.com/questions/3513650/timing-a-commands-execution-in-powershell
function lastCommandTime() {
    $command = Get-History -Count 1  
    return $command.EndExecutionTime - $command.StartExecutionTime
}

set-alias lct lastCommandTime

vpetruchok

function playNotificationSound() {
  # From http://scriptolog.blogspot.com/2007/09/playing-sounds-in-powershell.html
  $sound = New-Object System.Media.SoundPlayer;
  $sound.SoundLocation="c:\WINDOWS\Media\notify.wav";
  $sound.Play();
}

function p() {
  Param(
    $ComputerName="google.com" 

vpetruchok

#!/bin/sh

git for-each-ref --sort=-committerdate --format '%(objectname:short) %(objecttype) %(refname) | %(committerdate:relative)  %(if)%(authorname)%(then)(by %(authorname) %(authoremail))%(end)' "$@" | column  -t -s\|

Documentation: https://git-scm.com/docs/git-for-each-ref

Fields for the --format option

vpetruchok

Task	Emacs	Vim
Quit Editor with an error code	(kill-emacs <exitcode>)	:cq
Toggle whitespace visualization	M-x whitespace-mode	:set list!