Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2020-02-07 | t3308: make test work with SHA-256 | brian m. carlson | 1 | -28/+55 |
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' | SZEDER Gábor | 1 | -1/+1 |
2017-10-07 | t3308: create a real ref directory/file conflict | Jeff King | 1 | -1/+1 |
2016-01-17 | notes: allow merging from arbitrary references | Jacob Keller | 1 | -11/+11 |
2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 1 | -0/+188 |
2010-11-17 | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 1 | -0/+180 |