?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
rebase --apply: fix reflog
2022-01-26 Phillip Woodrebase --apply: fix reflog
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodreset_head(): take struct rebase_head_opts
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodrebase: cleanup reset_head() calls
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodcreate_autostash(): remove unneeded parameter
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodreset_head(): make default_reflog_action optional
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodreset_head(): factor out ref updates
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodreset_head(): remove action parameter
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodrebase --apply: don't run post-checkout hook if there...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodrebase: do not remove untracked files on checkout
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodrebase: pass correct arguments to post-checkout hook
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodt5403: refactor rebase post-checkout hook tests
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2022-01-26 Phillip Woodrebase: factor out checkout for up to date branch
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-11-03 Phillip Woodrebase -i: fix rewording with --committer-date-is-author...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-10-18 Phillip Woodt1092: run "rebase --apply" without "-q" in testing
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-10-07 Phillip Woodsparse index: fix use-after-free bug in cache_tree_verify()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-24 Phillip Woodrebase: fix todo-list rereading
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-24 Phillip Woodsequencer.c: factor out a function
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-22 Phillip Woodrebase: dereference tags
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-22 Phillip Woodrebase: use lookup_commit_reference_by_name()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-22 Phillip Woodrebase: use our standard error return value
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: rework rebase --quit tests
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: strengthen rebase --abort tests
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: use test_path_is_missing
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: rename a variable
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: use test_cmp_rev
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: use test_commit
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-09-13 Phillip Woodt3407: run tests in $TEST_DIRECTORY
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-23 Phillip Woodrebase -r: fix merge -c with a merge strategy
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-23 Phillip Woodrebase -r: don't write .git/MERGE_MSG when fast-forwarding
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-23 Phillip Woodrebase -i: add another reword test
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-20 Phillip Woodrebase -r: make 'merge -c' behave like reword
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-13 Phillip Woodrebase --continue: remove .git/MERGE_MSG
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-13 Phillip Woodrebase --apply: restore some tests
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-08-13 Phillip Woodt3403: fix commit authorship
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-05-05 Phillip Woodpatience diff: remove unused variable
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-05-05 Phillip Woodpatience diff: remove unnecessary string comparisons
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-05-05 Phillip Woodword diff: handle zero length matches
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-01-29 Phillip Woodrebase -i: comment out squash!/fixup! subjects from...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-01-21 Phillip Woodsequencer: factor out code to append squash message
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2021-01-21 Phillip Woodrebase -i: only write fixup-message when it's needed
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-11-04 Phillip Woodrebase -i: simplify get_revision_ranges()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-11-04 Phillip Woodrebase -i: use struct object_id when writing state
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-11-04 Phillip Woodrebase -i: use struct object_id rather than looking...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-11-04 Phillip Woodrebase -i: stop overwriting ORIG_HEAD buffer
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-09-09 Phillip Woodadd -p: fix editing of intent-to-add paths
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-09-08 Phillip Woodadd -p: fix memory leak
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-08-19 Phillip Woodrebase -i: support --ignore-date
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-08-17 Phillip Woodrebase -i: support --committer-date-is-author-date
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-08-17 Phillip Woodam: stop exporting GIT_COMMITTER_DATE
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-08-17 Phillip Woodadd -p: fix checking of user input
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2020-08-17 Phillip Woodadd -p: use ALLOC_GROW_BY instead of ALLOW_GROW
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodcommit: give correct advice for empty commit during...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodcommit: encapsulate determine_whence() for sequencer
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodcommit: use enum value for multiple cherry-picks
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodsequencer: write CHERRY_PICK_HEAD for reword and edit
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodcherry-pick: check commit error messages
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-12-06 Phillip Woodt3404: use test_cmp_rev
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-11-23 Phillip Woodsequencer: fix empty commit check when amending
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodsequencer: run post-commit hook
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodmove run_commit_hook() to libgit and use it there
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodsequencer.h fix placement of #endif
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodt3404: remove uneeded calls to set_fake_editor
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodt3404: set $EDITOR in subshell
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-10-16 Phillip Woodt3404: remove unnecessary subshell
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-08-19 Phillip Woodsequencer: simplify root commit creation
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-08-19 Phillip Woodrebase -i: check for updated todo after squash and...
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-08-19 Phillip Woodrebase -i: always update HEAD before rewording
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-07-08 Phillip Woodt3420: remove progress lines before comparing output
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-07-01 Phillip Woodgit-prompt: improve cherry-pick/revert detection
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-06-27 Phillip Woodstatus: do not report errors in sequencer/todo
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-06-27 Phillip Woodsequencer: factor out todo command name parsing
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-06-27 Phillip Woodsequencer: always allow tab after command name
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-06-18 Phillip Woodshow --continue/skip etc. consistently in synopsis
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-06-13 Phillip Woodadd -p: fix checkout -p with pathological context
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-05-19 Phillip Woodrebase -r: always reword merge -c
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-05-15 Phillip Woodrebase --abort/--quit: cleanup refs/rewritten
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-05-15 Phillip Woodsequencer: return errors from sequencer_remove_state()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-05-15 Phillip Woodrebase: warn if state directory cannot be removed
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-05-15 Phillip Woodrebase: fix a memory leak
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: run without forking rebase--interactive
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase: use a common action enum
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: use struct rebase_options in do_interactive_rebase()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: use struct rebase_options to parse args
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: use struct object_id for squash_onto
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: use struct commit when parsing options
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: remove duplication
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase -i: combine rebase--interactive.c with rebase.c
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase: use OPT_RERERE_AUTOUPDATE()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase: rename write_basic_state()
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodrebase: don't translate trace strings
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodsequencer: always discard index after checkout
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-19 Phillip Woodsequencer.c: save and restore cleanup mode
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-18 Phillip Woodsequencer: fix cleanup with --signoff and -x
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-17 Phillip Woodfix cherry-pick/revert status after commit
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-04-17 Phillip Woodcommit/reset: try to clean up sequencer state
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-03-18 Phillip Woodcherry-pick --continue: remember options
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-03-18 Phillip Woodcherry-pick: demonstrate option amnesia
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-03-18 Phillip Woodsequencer: break some long lines
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-03-18 Phillip Woodmerge: tweak --rerere-autoupdate documentation
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
2019-03-18 Phillip Woodam/cherry-pick/rebase/revert: document --rerere-autoupdate
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
 commit | commitdiff | tree
next
The Best VCS Around