diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:43 -0800 |
| commit | f7d07cce82ccdbc3a7cf343943d359287cb19c5a (patch) | |
| tree | c0b4b2d188802f1846dd8d2558e7a5cf033d3ffb /builtin/merge.c | |
| parent | Merge branch 'tc/completion-reflog' (diff) | |
| parent | handle arbitrary ints in git_config_maybe_bool (diff) | |
| download | tgif-f7d07cce82ccdbc3a7cf343943d359287cb19c5a.tar.xz | |
Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool:
handle arbitrary ints in git_config_maybe_bool
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions