![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Dec 2010 23:23:50 +0000 (15:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Dec 2010 23:23:55 +0000 (15:23 -0800) | ||
| commit | b281796eeb925f5e91d27cd6c6c579c925577160 | |
| tree | 81a2a185c76af961dfa5145a30779b5f59170202 | tree | snapshot |
| parent | 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 | commit | diff |
| parent | 6079ec6680da5e40d15d981c24051e9bf5c226fc | commit | diff |
Merge branch 'maint' to sync with Git 1.7.3.3
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
| Documentation/git-pull.txt | diff1 | | diff2 | | blob | history |