author | Junio C Hamano <junkio@cox.net> | |
Tue, 7 Mar 2006 04:58:41 +0000 (20:58 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 7 Mar 2006 04:58:41 +0000 (20:58 -0800) | ||
commit | e4a0e2aac0e667a3a9b4449c5be4e084c4a9c44e | |
tree | 4e90857a928d9f0007bc63085aa4def01ce640f0 | tree | snapshot |
parent | 9c3592cf3cf9a9d49ad9a69b76d2be130a21d499 | commit | diff |
parent | 2dcdb4c69737185f0b0e9fe08ba52b95b84f13da | commit | diff |
Merge branch 'master' into next
* master:
Merge branch 'sp/checkout'
Merge branch 'fd/asciidoc'
Allow format-patch to attach patches
Allow adding arbitary lines in the mail header generated by format-patch.
* master:
Merge branch 'sp/checkout'
Merge branch 'fd/asciidoc'
Allow format-patch to attach patches
Allow adding arbitary lines in the mail header generated by format-patch.