summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-04 15:02:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-04 15:02:08 -0700
commitfa38cfc2c6ce197960f85798aac18ee78aa83f1f (patch)
tree89f156b00f35fe5c92ac75c9ccf51f043fe65dd9 /builtin/merge-index.c
parentMerge branch 'jl/submodule-fetch-on-demand' (diff)
parentDocumentation: trivial grammar fix in core.worktree description (diff)
downloadtgif-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