2021-12-20 | Jerry Zhang | git-apply: skip threeway in add / rename cases Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |
2021-12-13 | Jerry Zhang | git-apply: add --allow-empty flag Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |
2021-12-13 | Jerry Zhang | git-apply: add --quiet flag Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |
2021-04-29 | Jerry Zhang | apply: adjust messages to account for --3way changes Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |
2021-04-08 | Jerry Zhang | git-apply: allow simultaneous --cached and --3way options Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |
2021-04-07 | Jerry Zhang | git-apply: try threeway first when "--3way" is used Signed-off-by: Jerry Zhang <jerry@skydio.com> |
commitcommitdifftree |