diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
| commit | bc67ad8c375ce8f31021411f088a968f12cb2675 (patch) | |
| tree | 5cc9d598cf4040177c3765322f9b5f2551ba0d08 /Documentation/merge-config.txt | |
| parent | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint (diff) | |
| parent | t/annotate-tests: Use echo & cat instead of sed (diff) | |
| download | tgif-bc67ad8c375ce8f31021411f088a968f12cb2675.tar.xz | |
Merge branch 'js/blame-parsename' into maint
* js/blame-parsename:
t/annotate-tests: Use echo & cat instead of sed
blame: tolerate bogus e-mail addresses a bit better
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions