| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstr | Edward Thomson | 2021-10-17 | 1 | -1/+0 |
| * | fileops: rename to "futils.h" to match function signatures | Patrick Steinhardt | 2019-07-20 | 1 | -1/+1 |
| * | treewide: remove use of C++ style comments | Patrick Steinhardt | 2018-07-13 | 1 | -1/+1 |
| * | merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlf | Edward Thomson | 2018-01-21 | 1 | -0/+48 |
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -0/+1 |
| * | diff: don't feed large files to xdiff | Edward Thomson | 2015-10-05 | 1 | -3/+3 |
| * | merge_file: treat large files as binary | Edward Thomson | 2015-10-05 | 1 | -0/+88 |
| * | merge_files: don't add trailing newlines | Edward Thomson | 2015-07-07 | 1 | -0/+39 |
| * | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
| * | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 1 | -0/+76 |
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -0/+175 |
