![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 11 Apr 2006 02:45:30 +0000 (19:45 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 11 Apr 2006 02:45:30 +0000 (19:45 -0700) | ||
| commit | 8fcd4218c63d15481d8fbb12c3fddfffa98e1adc | |
| tree | 48861ca4e26905814119020e41beb0aff6342cab | tree | snapshot |
| parent | 6b32ee2381deb414378a76cae213a4fe633f8fcc | commit | diff |
| parent | 474958871394365ee7807d88217c3d75269161a6 | commit | diff |
Merge branch 'eb/apply' into next
* eb/apply:
Implement limited context matching in git-apply.
* eb/apply:
Implement limited context matching in git-apply.