diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:55 -0800 |
| commit | b281796eeb925f5e91d27cd6c6c579c925577160 (patch) | |
| tree | 81a2a185c76af961dfa5145a30779b5f59170202 /xdiff | |
| parent | 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 (diff) | |
| parent | 6079ec6680da5e40d15d981c24051e9bf5c226fc (diff) | |
| download | git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.gz | |
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions