author | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Mar 2008 04:07:49 +0000 (20:07 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Mar 2008 04:07:57 +0000 (20:07 -0800) | ||
commit | ad416ed433fdcf838916a84177fe9e810be19eff | |
tree | dcba56533726b1e791b4c9ab8f44c7f8fd4a1b2e | tree | snapshot |
parent | caa99829a24bc4decf86278c3478c88f564a795a | commit | diff |
parent | 56d5fe285583b5177ffc65dbe7df636ed5b8cc6b | commit | diff |
Merge branch 'maint' to sync with 1.5.4.4
* maint:
GIT 1.5.4.4
ident.c: reword error message when the user name cannot be determined
Fix dcommit, rebase when rewriteRoot is in use
Really make the LF after reset in fast-import optional
* maint:
GIT 1.5.4.4
ident.c: reword error message when the user name cannot be determined
Fix dcommit, rebase when rewriteRoot is in use
Really make the LF after reset in fast-import optional
Documentation/RelNotes-1.5.5.txt | diff1 | | | | blob | history |
Documentation/git.txt | diff1 | | diff2 | | blob | history |
fast-import.c | diff1 | | diff2 | | blob | history |
git-svn.perl | diff1 | | diff2 | | blob | history |
t/t9300-fast-import.sh | diff1 | | diff2 | | blob | history |