author | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Sep 2007 09:32:24 +0000 (02:32 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Sep 2007 09:32:24 +0000 (02:32 -0700) | ||
commit | 57543a254c6aef8fca5556e25a9fa6dd5622b037 | |
tree | 022b6895b107d5c81e6b9a4f211c06ca5f1c17c0 | tree | snapshot |
parent | d05ec5a064e402475ab48617213f2a619a2fabc5 | commit | diff |
parent | 7b02b85a66fee6b357e02f9e70dd0baa0fd24308 | commit | diff |
Merge branch 'maint'
* maint:
git-svn: understand grafts when doing dcommit
git-diff: don't squelch the new SHA1 in submodule diffs
git-svn: fix "Malformed network data" with svn:// servers
(cvs|svn)import: Ask git-tag to overwrite old tags.
Documentation / grammer nit
* maint:
git-svn: understand grafts when doing dcommit
git-diff: don't squelch the new SHA1 in submodule diffs
git-svn: fix "Malformed network data" with svn:// servers
(cvs|svn)import: Ask git-tag to overwrite old tags.
Documentation / grammer nit