diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
| commit | 373654ee0f568fdeab891c621d6a1ac6b0c15d3a (patch) | |
| tree | 874b0b65f053953d102e53830492002c12275ecd /merge-tree.c | |
| parent | Fix the building of gitman.info document (diff) | |
| parent | Prepare for v1.6.1.1 maintenance release (diff) | |
| download | tgif-373654ee0f568fdeab891c621d6a1ac6b0c15d3a.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list
Conflicts:
RelNotes
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions