diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
| commit | e6cb314c087661a535b8873502b6d40cef1bbd57 (patch) | |
| tree | b097ca74690e1d6bf8a95b5162eb95ec931ad5ed /merge-file.c | |
| parent | 41d8a5f0f7db6e1d92f925234eb8c55d2d34a5af (diff) | |
| parent | d054680c7d245b71ebba0dd030fd13dce213559a (diff) | |
| download | git-e6cb314c087661a535b8873502b6d40cef1bbd57.tar.gz git-e6cb314c087661a535b8873502b6d40cef1bbd57.tar.xz | |
Merge branch 'ph/diffopts'
* ph/diffopts:
Reorder diff_opt_parse options more logically per topics.
Make the diff_options bitfields be an unsigned with explicit masks.
Use OPT_BIT in builtin-pack-refs
Use OPT_BIT in builtin-for-each-ref
Use OPT_SET_INT and OPT_BIT in builtin-branch
parse-options new features.
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions