Skip to content

Instantly share code, notes, and snippets.

@LSTANCZYK
LSTANCZYK / github.css
Last active August 29, 2015 14:09 — forked from theconektd/github.css
body {
font-family: Helvetica, arial, sans-serif;
font-size: 14px;
line-height: 1.6;
padding-top: 10px;
padding-bottom: 10px;
background-color: white;
padding: 30px; }
body > *:first-child {
# Usage
# Commit-Project ABB-499
# This command will commit with message from issue ABB-499
# Commit-Project ABB-499 "Foo bar"
# This command will commit with message from issue ABB-499 and "Foo bar" at the end
#
# Script may once ask you JIRA url, your user name and password.
# You can use -Verbose modifier to get more details what script do
# Requires PsGet http://psget.net/
; ==========================================================
; Config file for .NET Reflector including assembly lists
; for several versions of DevExpress XAF.
;
; Copy this file to:
; %LocalAppData%\Red Gate\.NET Reflector 8\Reflector.cfg
; ==========================================================
[AssemblyBrowser]
AssemblyList="DevExpress 13.2"
@LSTANCZYK
LSTANCZYK / hgrc
Last active August 29, 2015 14:15 — forked from Gab-km/hgrc
# hgrc
[extensions]
mq =
hgshelve = $HOME/.mercurial/extensions/hgshelve/hgshelve.py
[alias]
# fix latest commit message
fix = ! hg shelve --all -n 'tmp.hg-fix' && hg qtop > NUL & if errorlevel 1 ( hg qimport -r . && hg qrefresh -m "$1" && hg qfinish -a ) else ( hg qrefresh -m "$1" ) && hg unshelve -n 'tmp.hg-fix'
#!/bin/bash
# force-one-head
# add the following to <repository>/.hg/hgrc :
# [hooks]
# pretxnchangegroup.forceonehead = /path/to/force-one-head
if [ $(hg heads --template "{branch}\n"|sort|uniq|wc -l) != $(hg heads --template "{branch}\n"|sort|wc -l) ]; then
echo "There are multiple heads."
echo "Please 'hg pull' and get your repository up to date first."
echo "Also, don't 'hg push --force' because that won't work either."
@LSTANCZYK
LSTANCZYK / hgrc
Last active August 29, 2015 14:15 — forked from Gab-km/hgrc
# hgrc
# hg-now is the simple alias inspired by git-now.
# (http://d.hatena.ne.jp/sinsoku/20101208/1291770514)
# and it is for Windows environments.
# if you use some Unix base operating systems, like Linux distributions, BSDs or Macs,
# please hack it in your environment.
[alias]
# create a temporary commit.
now = ! hg commit -m "[from now] %date% %time%"
@LSTANCZYK
LSTANCZYK / hgfogbugz.py
Last active August 29, 2015 14:15 — forked from keyo/hgfogbugz.py
"""
HG Fogbugz Mercurial Extension
Prevents committing bad BugIDs
Add to .hgrc or mercurial.ini
[extensions]
fogbugz = C:\Users\User\hg_extensions\hgfogbugz.py
"""
#!/usr/bin/python2
# Copyright (c) 2014 Kenneth Henderick <[email protected]>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#

how to install tortoisemerge to torgoisehg

Install latest tortoiseSVN (tortoise merge is included).

Assumed TortoiseSVN is installed to C:\Program Files\TortoiseSVN\

Edit .hgrc

[extdiff]

cmd.tortoisemerge = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe