diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:03 -0800 |
| commit | e049109ef11be4e164c6f0426fb77c9c7a1ab647 (patch) | |
| tree | 9dac08e47724ecfe383331b49685c707aa4e2453 /Documentation/merge-config.txt | |
| parent | Merge branch 'ef/mingw-write' (diff) | |
| parent | diff_filespec: use only 2 bits for is_binary flag (diff) | |
| download | tgif-e049109ef11be4e164c6f0426fb77c9c7a1ab647.tar.xz | |
Merge branch 'jk/diff-filespec-cleanup'
* jk/diff-filespec-cleanup:
diff_filespec: use only 2 bits for is_binary flag
diff_filespec: reorder is_binary field
diff_filespec: drop xfrm_flags field
diff_filespec: drop funcname_pattern_ident field
diff_filespec: reorder dirty_submodule macro definitions
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions