Age | Commit message (Expand) | Author | Files | Lines |
2021-12-20 | git-apply: skip threeway in add / rename cases | Jerry Zhang | 1 | -0/+18 |
2021-09-05 | apply: resolve trivial merge without hitting ll-merge with "--3way" | Junio C Hamano | 1 | -0/+45 |
2021-04-07 | git-apply: allow simultaneous --cached and --3way options | Jerry Zhang | 1 | -0/+50 |
2021-04-06 | git-apply: try threeway first when "--3way" is used | Jerry Zhang | 1 | -0/+20 |
2020-11-19 | t4*: adjust the references to the default branch name "main" | Johannes Schindelin | 1 | -8/+8 |
2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 1 | -0/+3 |
2019-10-24 | apply: respect merge.conflictStyle in --3way | Denton Liu | 1 | -1/+1 |
2019-10-24 | t4108: demonstrate bug in apply | Denton Liu | 1 | -2/+11 |
2019-10-24 | t4108: use `test_config` instead of `git config` | Denton Liu | 1 | -1/+1 |
2019-10-24 | t4108: remove git command upstream of pipe | Denton Liu | 1 | -6/+7 |
2019-10-24 | t4108: replace create_file with test_write_lines | Denton Liu | 1 | -17/+10 |
2012-07-09 | apply: tests for the --3way option | Junio C Hamano | 1 | -0/+54 |
2012-07-09 | apply: allow rerere() to work on --3way results | Junio C Hamano | 1 | -0/+25 |
2012-07-09 | apply: register conflicted stages to the index | Junio C Hamano | 1 | -0/+78 |