Version Control on Marko Apfel

Using Git for versioning of Word (doc/docx) documents

Wed, 24 Jun 2015 16:06:00 +0200

In too many projects I saw a chaos to store different versions of documents (in case these documents are edited over the time and older versions were kept for later analysis).

Each colleague has an own understanding how to name documents and how to add information about the status/version of the document. So it is not seldom to see timestamps as pre- or suffixes, user and user-acronyms as suffixes, and version numbers as suffixes. It gets really interesting if multiple users co-work on the same document and introduce their own naming guideline. After a few versions you are completely lost to know which document is the most recent version. Sometimes you can hope that sorting for timestamps of OS (Date modified) in the File Explorer leads you to the right one. But too often somebody opens a documents and changes by coincidence something inside (e.g. auto fields, like dates) and confirms the save question during closing with Yes. Then you have an older version with a newer timestamp.

Be careful when Git suppresses bin Folders

Fri, 05 Oct 2012 08:12:00 +0200

Initial situation

Often for Visual Studio projects the typical content of a .gitignore file contains this line

bin or
[B|b]in

It is used to avoid that Git tries to track compile outputs as repository relevant data.

Wise settings for Git

Thu, 31 May 2012 11:46:00 +0200

These settings reflecting my Git-environment. It a result of reading and trying several ideas of input from others.

Must-Haves

Aliases

[alias]
 ci = commit
 st = status
 co = checkout
 oneline = log --pretty=oneline
 br = branch
 la = log --pretty=\"format:%ad %h (%an): %s\" --date=short
 df = diff
 dc = diff --cached
 lg = log -p
 lol = log --graph --decorate --pretty=oneline --abbrev-commit
 lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
 ls = ls-files
 ign = ls-files -o -i --exclude-standard

Colors

[color]
 ui = auto
[color "branch"]
 current = yellow reverse
 local = yellow
 remote = green
[color "diff"]
 meta = yellow bold
 frag = magenta bold
 old = red bold
 new = green bold
 whitespace = red reverse
[color "status"]
 added = green
 changed = red
 untracked = cyan

Core

[core]
 autocrlf = true
 excludesfile = c:/Users/<user>/.gitignore
 editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession –noPlugin

Nice to have

Merge and Diff

[merge]
 tool = kdiff3
[mergetool "kdiff3"]
 path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[mergetool "p4merge"]
 path = c:/Program Files (x86)/Perforce Merge/p4merge.exe
 cmd = p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 keepTemporaries = false
 trustExitCode = false
 keepBackup = false
[diff]
 guitool = kdiff3
[difftool "kdiff3"]
 path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[difftool "p4merge"]
 path = C:/Users/<user>/My Applications/Perforce Merge/p4merge.exe
 cmd = \"p4merge.exe $LOCAL $REMOTE\"

Mercurial behind a proxy

Mon, 24 Jan 2011 17:57:00 +0100

For getting data with using a proxy simply modify the command with included --config-parameter with proxy-information.

So the original:

hg clone https://ralfwscratchpad.googlecode.com/hg/ ralfwscratchpad

transforms to:

hg --config http_proxy.host=proxy:8080 clone https://ralfwscratchpad.googlecode.com/hg/ ralfwscratchpad