diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-27 13:44:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-27 13:44:25 -0700 |
| commit | 2dc7f40d4424f66e1324a1600de3fcdd115ab07f (patch) | |
| tree | 6680ff45aeb60a73e9c6bba6d0c779473e6f0e35 /ll-merge.c | |
| parent | builtin-remote: (get_one_entry): use strbuf (diff) | |
| parent | gitweb/README: fix AliasMatch in example (diff) | |
| download | tgif-2dc7f40d4424f66e1324a1600de3fcdd115ab07f.tar.xz | |
Merge branch 'maint'
* maint:
gitweb/README: fix AliasMatch in example
Test grep --and/--or/--not
Test git archive --remote
fread does not return negative on error
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions