]>
2024-04-18 | Phillip Wood | rebase -m: fix --signoff with conflicts Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-18 | Phillip Wood | sequencer: store commit message in private context Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-18 | Phillip Wood | sequencer: move current fixups to private context Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-18 | Phillip Wood | sequencer: start removing private fields from public API Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-18 | Phillip Wood | sequencer: always free "struct replay_opts" Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-09 | Phillip Wood | t3428: restore coverage for "apply" backend Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-09 | Phillip Wood | t3428: use test_commit_message Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-04-09 | Phillip Wood | t3428: modernize test setup Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-03-14 | Phillip Wood | checkout: fix interaction between --conflict and -... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-03-14 | Phillip Wood | checkout: cleanup --conflict=<style> parsing Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-03-14 | Phillip Wood | merge options: add a conflict style member Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-03-14 | Phillip Wood | merge-ll: introduce LL_MERGE_OPTIONS_INIT Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-03-14 | Phillip Wood | xdiff-interface: refactor parsing of merge.conflictstyle Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-02-27 | Phillip Wood | rebase -i: stop setting GIT_CHERRY_PICK_HELP Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-02-09 | Phillip Wood | prune: mark rebase autostash and orig-head as reachable Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-02-07 | Phillip Wood | t1400: use show-ref to check pseudorefs Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2024-02-07 | Phillip Wood | show-ref --verify: accept pseudorefs Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-11-09 | Phillip Wood | unit tests: add TAP unit test framework Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | rebase -i: fix adding failed command to the todo list Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | rebase --continue: refuse to commit after failed command Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | rebase: fix rewritten list for failed pick Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | sequencer: factor out part of pick_commits() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | sequencer: use rebase_path_message() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | rebase -i: remove patch file after conflict resolution Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-09-06 | Phillip Wood | rebase -i: move unlink() calls Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-08-10 | Phillip Wood | t4053: avoid race when killing background processes Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-08-03 | Phillip Wood | rebase --skip: fix commit message clean up when skipping... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-07-05 | Phillip Wood | diff --no-index: support reading from named pipes Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-07-05 | Phillip Wood | t4054: test diff --no-index with stdin Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-07-05 | Phillip Wood | diff --no-index: die on error reading stdin Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-07-05 | Phillip Wood | diff --no-index: refuse to compare stdin to a directory Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-06-26 | Phillip Wood | apply: improve error messages when reading patch Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-04-10 | Phillip Wood | rebase: remove a couple of redundant strategy tests Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-04-10 | Phillip Wood | rebase -m: fix serialization of strategy options Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-04-10 | Phillip Wood | rebase -m: cleanup --strategy-option handling Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-04-10 | Phillip Wood | sequencer: use struct strvec to store merge strategy... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-04-10 | Phillip Wood | rebase: stop reading and writing unnecessary strategy... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-03-20 | Phillip Wood | wildmatch: hide internal return values Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-03-20 | Phillip Wood | wildmatch: avoid undefined behavior Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-03-20 | Phillip Wood | wildmatch: fix exponential behavior Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-02-23 | Phillip Wood | rebase -i: fix parsing of "fixup -C<commit>" Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-02-23 | Phillip Wood | rebase -i: match whole word in is_command() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-02-21 | Phillip Wood | rebase -i: check labels and refs when parsing todo... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-01-13 | Phillip Wood | rebase: cleanup "--exec" option handling Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2023-01-04 | Phillip Wood | ci(github): restore "print test failures" step name Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-11 | Phillip Wood | sequencer: tighten label lookups Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-11 | Phillip Wood | sequencer: unify label lookup Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-10 | Phillip Wood | git_parse_signed(): avoid integer overflow Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-10 | Phillip Wood | config: require at least one digit when parsing numbers Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-10 | Phillip Wood | git_parse_unsigned: reject negative values Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-09 | Phillip Wood | rebase: stop exporting GIT_REFLOG_ACTION Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-11-09 | Phillip Wood | sequencer: stop exporting GIT_REFLOG_ACTION Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase: cleanup action handling Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --abort: improve reflog message Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --apply: make reflog messages match rebase ... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --apply: respect GIT_REFLOG_ACTION Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --merge: fix reflog message after skipping Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --merge: fix reflog when continuing Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | t3406: rework rebase reflog tests Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --apply: remove duplicated code Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --keep-base: imply --no-fork-point Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase --keep-base: imply --reapply-cherry-picks Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase: factor out branch_base calculation Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase: rename merge_base to branch_base Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase: store orig_head as a commit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | rebase: be stricter when reading state files containing... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | t3416: set $EDITOR in subshell Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-17 | Phillip Wood | t3416: tighten two tests Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-10 | Phillip Wood | t3435: remove redundant test case Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-05 | Phillip Wood | ssh signing: return an error when signature cannot... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-10-03 | Phillip Wood | mailinfo -b: fix an out of bounds access Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-08-04 | Phillip Wood | tests: cache glibc version check Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-07-08 | Phillip Wood | xdiff: introduce XDL_ALLOC_GROW() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-07-08 | Phillip Wood | xdiff: introduce XDL_CALLOC_ARRAY() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-07-08 | Phillip Wood | xdiff: introduce xdl_calloc Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-07-08 | Phillip Wood | xdiff: introduce XDL_ALLOC_ARRAY() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-04-11 | Phillip Wood | tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-03-31 | Phillip Wood | worktree: add -z option for list subcommand Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-03-16 | Phillip Wood | terminal: restore settings on SIGTSTP Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-03-16 | Phillip Wood | terminal: work around macos poll() bug Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-03-16 | Phillip Wood | terminal: don't assume stdin is /dev/tty Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-03-16 | Phillip Wood | terminal: use flags for save_term() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-23 | Phillip Wood | add -p: disable stdin buffering when interactive.singlekey... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-23 | Phillip Wood | terminal: set VMIN and VTIME in non-canonical mode Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-23 | Phillip Wood | terminal: pop signal handler when terminal is restored Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-23 | Phillip Wood | terminal: always reset terminal when reading without... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-16 | Phillip Wood | xdiff: handle allocation failure when merging Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-16 | Phillip Wood | xdiff: refactor a function Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-16 | Phillip Wood | xdiff: handle allocation failure in patience diff Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-02-16 | Phillip Wood | xdiff: fix a memory leak Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | rebase -m: don't fork git checkout Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | rebase --apply: set ORIG_HEAD correctly Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | rebase --apply: fix reflog Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | reset_head(): take struct rebase_head_opts Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | rebase: cleanup reset_head() calls Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | create_autostash(): remove unneeded parameter Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | reset_head(): make default_reflog_action optional Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | reset_head(): factor out ref updates Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | reset_head(): remove action parameter Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
2022-01-26 | Phillip Wood | rebase --apply: don't run post-checkout hook if there... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
commit | commitdiff | tree |
next |