![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 27 Feb 2006 23:54:36 +0000 (15:54 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 27 Feb 2006 23:54:36 +0000 (15:54 -0800) | ||
| commit | 6d5e6fff52968443018af56e2966cf5866130a4e | |
| tree | 447b7edc52a7c702b60b69d0644a39dac0f417b3 | tree | snapshot |
| parent | bfea9fc499360124f7c34ff8fe52a286e9629165 | commit | diff |
| parent | f3a4ec48e402a7b49d410bdcb23470e9723788b0 | commit | diff |
Merge branch 'master' into next
* master:
Merge part of kh/svnimport branch into master
contrib/git-svn: correct commit example in manpage
contrib/git-svn: tell the user to not modify git-svn-HEAD directly
gitview: Remove trailing white space
gitview: Fix the encoding related bug
git-format-patch: Always add a blank line between headers and body.
combine-diff: Honour -z option correctly.
combine-diff: Honour --full-index.
* master:
Merge part of kh/svnimport branch into master
contrib/git-svn: correct commit example in manpage
contrib/git-svn: tell the user to not modify git-svn-HEAD directly
gitview: Remove trailing white space
gitview: Fix the encoding related bug
git-format-patch: Always add a blank line between headers and body.
combine-diff: Honour -z option correctly.
combine-diff: Honour --full-index.