![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800) | ||
| commit | df45467ec98aa1c532196732c96a62589223353e | |
| tree | e46769f742a59a9bc32f878cec51d286f6b3be11 | tree | snapshot |
| parent | 0c1fc940eeae051e890304c40d1e66a478afadc8 | commit | diff |
| parent | 2beb3cdd18225be657849790ed845c4d367b760a | commit | diff |
Merge branch 'master' into next
* master:
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
Merge branch 'maint'
read-tree --aggressive: remove deleted entry from the working tree.
Merge branch 'jc/tag'
Merge part of 'jc/diff'
* master:
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
Merge branch 'maint'
read-tree --aggressive: remove deleted entry from the working tree.
Merge branch 'jc/tag'
Merge part of 'jc/diff'