| 2019-07-01 | git-prompt: improve cherry-pick/revert detection Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-05-19 | rebase -r: always reword merge -c Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: run without forking rebase--interactive Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase: use a common action enum Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: use struct rebase_options in do_interactive_rebase() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: use struct rebase_options to parse args Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: use struct object_id for squash_onto Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: use struct commit when parsing options Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: remove duplication Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase -i: combine rebase--interactive.c with rebase.c Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase: use OPT_RERERE_AUTOUPDATE() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase: rename write_basic_state() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | rebase: don't translate trace strings Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | sequencer: always discard index after checkout Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-19 | sequencer.c: save and restore cleanup mode Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-18 | sequencer: fix cleanup with --signoff and -x Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-17 | fix cherry-pick/revert status after commit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-04-17 | commit/reset: try to clean up sequencer state Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-03-18 | cherry-pick --continue: remember options Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-03-18 | cherry-pick: demonstrate option amnesia Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-03-18 | sequencer: break some long lines Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-03-18 | merge: tweak --rerere-autoupdate documentation Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-03-18 | am/cherry-pick/rebase/revert: document --rerere-autoupdate Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-29 | rebase -x: sanity check command Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-28 | implicit interactive rebase: don't run sequence editor Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved-ws: handle blank lines Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved-ws: modify allow-indentation-change Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved-ws: optimize allow-indentation-change Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved=zebra: be stricter with color alternation Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved-ws: fix false positives Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff --color-moved-ws: demonstrate false positives Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff: allow --no-color-moved-ws Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | Use "whitespace" consistently Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2019-01-10 | diff: document --no-color-moved Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-11-01 | sequencer: use read_author_script() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-11-01 | add read_author_script() to libgit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-11-01 | am: rename read_author_script() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-11-01 | am: improve author-script error reporting Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-11-01 | am: don't die in read_author_script() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-10-05 | diff --color-moved: fix a memory leak Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-10-05 | diff --color-moved-ws: fix another memory leak Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-10-05 | diff --color-moved-ws: fix a memory leak Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-10-05 | diff --color-moved-ws: fix out of bounds string access Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-10-05 | diff --color-moved-ws: fix double free crash Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-09-11 | diff: fix --color-moved-ws=allow-indentation-change Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-08-16 | rebase -i: fix SIGSEGV when 'merge <branch>' fails Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-08-16 | t3430: add conflicting commit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-08-15 | rebase -i: fix numbering in squash message Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-08-07 | sequencer: fix quoting in write_author_script Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-08-07 | sequencer: handle errors from read_author_ident() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-06-19 | sequencer: do not squash 'reword' commits when we hit... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-06-11 | add -p: fix counting empty context lines in edited... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-04-26 | rebase --rebase-merges: add test for --keep-empty Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-29 | rebase --keep-empty: always use interactive rebase Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-29 | rebase -p: error out if --signoff is given Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-29 | rebase: extend --signoff support Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-29 | rebase: respect --no-keep-empty Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-29 | rebase -i --keep-empty: don't prune empty commits Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-20 | rebase --root: stop assuming squash_onto is unset Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-05 | add -p: don't rely on apply's '--recount' option Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-05 | add -p: fix counting when splitting and coalescing Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-05 | add -p: calculate offset delta for edited patches Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-01 | add -p: adjust offsets of subsequent hunks when one... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-01 | t3701: add failing test for pathological context lines Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-03-01 | t3701: don't hard code sha1 hash values Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-20 | t3701: use test_write_lines and write_script Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-20 | t3701: indent here documents Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-20 | add -i: add function to format hunk header Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-13 | add -p: improve error messages Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-13 | add -p: only bind search key if there's more than one... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-02-13 | add -p: only display help for active keys Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-01-24 | sequencer: run 'prepare-commit-msg' hook Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-01-24 | t7505: add tests for cherry-pick and rebase -i/-p Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2018-01-24 | t7505: style fixes Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-12-13 | sequencer: improve config handling Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-24 | t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COM... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-24 | sequencer: try to commit without forking 'git commit' Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-24 | sequencer: load commit related config Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-24 | sequencer: simplify adding Signed-off-by: trailer Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-24 | commit: move print_commit_summary() to libgit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-18 | commit: move post-rewrite code to libgit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-18 | Add a function to update HEAD after creating a commit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-16 | sequencer: reschedule pick if index can't be locked Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-16 | config: avoid "write_in_full(fd, buf, len) != len"... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-10 | commit: move empty message checks to libgit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-11-10 | t3404: check intermediate squash messages Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-08 | am: fix signoff when other trailers are present Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | cherry-pick/revert: reject --rerere-autoupdate when... Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | cherry-pick/revert: remember --rerere-autoupdate Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | t3504: use test_commit Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | rebase -i: honor --rerere-autoupdate Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | rebase: honor --rerere-autoupdate Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-08-02 | am: remember --rerere-autoupdate setting Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-30 | t9700: add tests for Git::unquote_path() Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-30 | Git::unquote_path(): throw an exception on bad path Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-30 | Git::unquote_path(): handle '\a' Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-30 | add -i: move unquote_path() to Git.pm Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-19 | rebase: add more regression tests for console output Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-19 | rebase: add regression tests for console output Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |
| 2017-06-19 | rebase -i: add test for reflog message Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> |
diff | tree |