![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 17:42:56 +0000 (10:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 17:42:56 +0000 (10:42 -0700) | ||
| commit | bc8f2fb5be3421be168c765fac893bedc93d706e | |
| tree | de988e8ec082d09e74dcd3d67b542c46577f5a35 | tree | snapshot |
| parent | 78bbbf98d9ac354f464070571b6dbf468e3335bf | commit | diff |
| parent | 3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e | commit | diff |
Merge branch 'master' into next
* master:
t0003: properly quote $HOME
contrib/ciabot: git-describe commit instead of HEAD
Fix a formatting error in git-merge.txt
git-gui: apply color information from git diff output
git-gui: use wordprocessor tab style to ensure tabs work as expected
git-gui: correct assignment of work-tree
git-gui: use full dialog width for old name when renaming branch
git-gui: generic version trimming
git-gui: enable the Tk console when tracing/debugging on Windows
git-gui: show command-line errors in a messagebox on Windows
On Windows, avoid git-gui to call Cygwin's nice utility
* master:
t0003: properly quote $HOME
contrib/ciabot: git-describe commit instead of HEAD
Fix a formatting error in git-merge.txt
git-gui: apply color information from git diff output
git-gui: use wordprocessor tab style to ensure tabs work as expected
git-gui: correct assignment of work-tree
git-gui: use full dialog width for old name when renaming branch
git-gui: generic version trimming
git-gui: enable the Tk console when tracing/debugging on Windows
git-gui: show command-line errors in a messagebox on Windows
On Windows, avoid git-gui to call Cygwin's nice utility