diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-04 15:02:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-04 15:02:08 -0700 |
commit | fa38cfc2c6ce197960f85798aac18ee78aa83f1f (patch) | |
tree | 89f156b00f35fe5c92ac75c9ccf51f043fe65dd9 /builtin/merge-index.c | |
parent | Merge branch 'jl/submodule-fetch-on-demand' (diff) | |
parent | Documentation: trivial grammar fix in core.worktree description (diff) | |
download | tgif-fa38cfc2c6ce197960f85798aac18ee78aa83f1f.tar.xz |
Merge branch 'maint'
* maint:
Documentation: trivial grammar fix in core.worktree description
gitweb: Fix parsing of negative fractional timezones in JavaScript
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions