aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2015-12-11rebase -i: remember merge options beyond continue actionsFabian Ruch1-11/+7
2015-11-13rebase-i-exec: Allow space in SHELL_PATHFredrik Medley1-1/+1
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-0/+12
2015-10-28rebase-i: work around Windows CRLF line endingsJunio C Hamano1-0/+12
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-35/+31
2015-10-05rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy1-33/+29
2015-10-02rebase-i: explicitly accept tab as separator in commandsMatthieu Moy1-2/+2
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano1-4/+188
2015-08-03Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano1-3/+17
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano1-1/+5
2015-06-30git rebase -i: add static check for commands and SHA-1Galan Rémi1-0/+72
2015-06-30git rebase -i: warn about removed commitsGalan Rémi1-3/+114
2015-06-30git-rebase -i: add command "drop" to remove a commitGalan Rémi1-1/+2
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin1-1/+5
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo1-3/+17
2015-06-01Merge branch 'mm/rebase-i-post-rewrite-exec'Junio C Hamano1-5/+5
2015-05-22rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy1-5/+5
2015-05-19Merge branch 'ph/rebase-i-redo'Junio C Hamano1-0/+16
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-3/+3
2015-04-29rebase -i: redo tasks that die during cherry-pickPhil Hord1-0/+16
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano1-1/+2
2015-03-17Merge branch 'es/rebase-i-count-todo'Junio C Hamano1-1/+2
2015-03-06rebase-interactive: re-word "item count" commentEric Sunshine1-1/+1
2015-03-06rebase-interactive: suppress whitespace preceding item countEric Sunshine1-0/+1
2015-03-05Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano1-9/+8
2015-02-17Merge branch 'ks/rebase-i-abbrev'Junio C Hamano1-9/+8
2015-01-22rebase -i: use full object name internally throughout the scriptKirill A. Shutemov1-9/+8
2014-12-10Show number of TODO items for interactive rebaseOnno Kortmann1-1/+3
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy1-3/+3
2014-07-16rebase: omit patch-identical commits with --fork-pointJohn Keeping1-1/+1
2014-06-25Merge branch 'ep/avoid-test-a-o'Junio C Hamano1-1/+1
2014-06-25Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano1-2/+2
2014-06-16Merge branch 'rr/rebase-autostash-fix'Junio C Hamano1-2/+2
2014-06-09git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto1-1/+1
2014-05-19rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra1-2/+2
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano1-0/+15
2014-04-17rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay1-0/+15
2014-03-25Merge branch 'us/printf-not-echo'Junio C Hamano1-1/+1
2014-03-17rebase -i: do not "echo" random user-supplied stringsUwe Storbeck1-1/+1
2014-02-11rebase: add the --gpg-sign optionNicolas Vigier1-13/+26
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder1-6/+3
2013-09-30rebase -i: respect core.abbrevKirill A. Shutemov1-1/+1
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano1-0/+30
2013-09-11Merge branch 'rt/rebase-p-no-merge-summary'Junio C Hamano1-1/+2
2013-09-11Merge branch 'es/rebase-i-respect-core-commentchar'Junio C Hamano1-1/+1
2013-08-25rebase -i: fix short SHA-1 collisionJunio C Hamano1-0/+30
2013-08-21rebase --preserve-merges: ignore "merge.log" configRalf Thielow1-1/+2
2013-08-18rebase -i: fix cases ignoring core.commentcharEric Sunshine1-1/+1
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano1-1/+5
2013-07-11Merge branch 'af/rebase-i-merge-options'Junio C Hamano1-5/+16
2013-07-02Do not ignore merge options in interactive rebaseArnaud Fontaine1-5/+16
2013-06-27rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott1-5/+20
2013-06-23rebase -i: use a better reflog messageRamkumar Ramachandra1-1/+5
2013-05-12rebase -i: return control to caller, for housekeepingRamkumar Ramachandra1-4/+5
2013-05-12rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra1-1/+1
2013-04-25bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger1-0/+5
2013-02-17Merge branch 'jk/rebase-i-comment-char'Junio C Hamano1-40/+44
2013-02-12rebase -i: respect core.commentcharJohn Keeping1-40/+44
2013-01-21Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano1-1/+6
2013-01-14rebase --preserve-merges: keep all merge commits including empty onesPhil Hord1-1/+6
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano1-13/+40
2012-09-19rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt1-2/+3
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt1-0/+4
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong1-0/+17
2012-09-17rebase -i: Refactor help messages for todo fileAndrew Wong1-11/+20
2012-09-10Merge branch 'maint-1.7.11' into maintJunio C Hamano1-2/+1
2012-09-10Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano1-2/+1
2012-08-29Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano1-2/+1
2012-08-10rebase -i: use full onto sha1 in reflogMichael J Gruber1-2/+1
2012-07-25Merge branch 'cw/rebase-i-root'Junio C Hamano1-12/+13
2012-07-24rebase -i: handle fixup of root commit correctlyChris Webb1-12/+13
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano1-6/+26
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano1-3/+1
2012-06-26rebase -i: support --root without --ontoChris Webb1-6/+26
2012-06-26rebase: don't source git-sh-setup twiceMartin von Zweigbergk1-3/+1
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong1-0/+23
2012-05-10Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano1-0/+2
2012-04-30Merge branch 'nh/empty-rebase'Junio C Hamano1-3/+32
2012-04-24git-rebase: add keep_empty flagNeil Horman1-3/+32
2012-04-23Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano1-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping1-1/+1
2012-03-20rebase -i: remind that the lines are top-to-bottomJunio C Hamano1-0/+2
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano1-13/+23
2011-12-16Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano1-13/+23
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong1-13/+23
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer1-1/+14
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano1-3/+9
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy1-1/+17
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong1-2/+1
2011-05-27rebase: write a reflog entry when finishingJeff King1-1/+3
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano1-1/+1
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong1-1/+1
2011-02-25Makefile: do not install sourced rebase scriptsMartin von Zweigbergk1-0/+0
2011-02-10rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk1-19/+0
2011-02-10rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk1-1/+0
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk1-2/+0
2011-02-10rebase: remember verbose optionMartin von Zweigbergk1-2/+0
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk1-4/+1
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk1-31/+3
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk1-14/+0
2011-02-10rebase -i: align variable namesMartin von Zweigbergk1-61/+59
2011-02-10rebase: show consistent conflict resolution hintMartin von Zweigbergk1-3/+1
2011-02-10rebase: factor out call to pre-rebase hookMartin von Zweigbergk1-14/+0
2011-02-10rebase: factor out clean work tree checkMartin von Zweigbergk1-2/+0
2011-02-10rebase: factor out reference parsingMartin von Zweigbergk1-44/+4
2011-02-10rebase: reorder validation stepsMartin von Zweigbergk1-2/+2
2011-02-10rebase -i: remove now unnecessary directory checksMartin von Zweigbergk1-6/+0
2011-02-10rebase: factor out command line option processingMartin von Zweigbergk1-162/+62
2011-02-10rebase: align variable contentMartin von Zweigbergk1-5/+11
2011-02-10rebase: align variable namesMartin von Zweigbergk1-240/+240
2011-02-10rebase: act on command line outside parsing loopMartin von Zweigbergk1-149/+151
2011-01-27Merge branch 'maint'Junio C Hamano1-2/+2
2011-01-27rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder1-1/+1
2011-01-26rebase: use explicit "--" with checkoutJeff King1-1/+1
2010-12-12Merge branch 'mz/rebase-i-verify'Junio C Hamano1-0/+2
2010-11-29Merge branch 'rr/needs-clean-work-tree'Junio C Hamano1-11/+3
2010-11-23rebase: support --verifyMartin von Zweigbergk1-0/+2
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard1-7/+33
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard1-0/+4
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra1-11/+3
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen1-1/+1
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano1-3/+3
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano1-0/+4
2010-08-21Merge branch 'mm/rebase-i-exec'Junio C Hamano1-6/+43
2010-08-15cherry-pick/revert: Use advise() for hintsJonathan Nieder1-3/+3
2010-08-13git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey1-2/+2
2010-08-13git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey1-9/+14
2010-08-11rebase -i: add exec command to launch a shell commandMatthieu Moy1-3/+35
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey1-6/+6
2010-07-14add configuration variable for --autosquash option of interactive rebaseHeiko Voigt1-0/+4
2010-07-05rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano1-5/+5
2010-07-05rebase-i: style fixJunio C Hamano1-5/+6
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort1-1/+2
2010-04-18rebase-interactive: silence warning when no commits rewrittenJeff King1-0/+1
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano1-1/+7
2010-04-03Merge branch 'do/rebase-i-arbitrary'Junio C Hamano1-2/+0
2010-03-28Merge branch 'cc/cherry-pick-ff'Junio C Hamano1-12/+3
2010-03-28rebase -i: make post-rewrite work for 'edit'Thomas Rast1-2/+3
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano1-2/+50
2010-03-24Teach rebase the --no-ff option.Marc Branchaud1-2/+7
2010-03-20rebase -i: use new --ff cherry-pick optionChristian Couder1-12/+3
2010-03-14rebase--interactive: don't require what's rebased to be a branchDave Olszewski1-2/+0
2010-03-12rebase: support automatic notes copyingThomas Rast1-0/+4
2010-03-12rebase -i: invoke post-rewrite hookThomas Rast1-1/+45
2010-03-12commit --amend: invoke post-rewrite hookThomas Rast1-1/+1
2010-01-26work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano1-3/+3
2010-01-26fix portability issues with $ in double quotesStephen Boyd1-1/+1
2010-01-23rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano1-4/+4
2010-01-22rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty1-1/+1
2010-01-20Merge branch 'mh/rebase-fixup'Junio C Hamano1-81/+143
2010-01-20Merge branch 'ns/rebase-auto-squash'Junio C Hamano1-0/+37
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano1-10/+35
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty1-39/+27
2010-01-14rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty1-27/+54
2010-01-14rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty1-15/+20
2010-01-14rebase -i: Extract function do_with_authorMichael Haggerty1-12/+15
2010-01-14rebase -i: Handle the author script all in one place in do_nextMichael Haggerty1-2/+2
2010-01-14rebase -i: Extract a function "commit_message"Michael Haggerty1-5/+10
2010-01-14rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty1-8/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty1-1/+1
2010-01-14rebase -i: Introduce a constant AMENDMichael Haggerty1-4/+12
2010-01-14rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty1-6/+11
2010-01-14rebase -i: Document how temporary files are usedMichael Haggerty1-7/+34
2010-01-14rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty1-4/+4
2010-01-14rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty1-1/+1
2010-01-14rebase -i: Inline expressionMichael Haggerty1-2/+1
2010-01-14rebase -i: Remove dead codeMichael Haggerty1-1/+0
2010-01-14rebase -i: Make the condition for an "if" more transparentMichael Haggerty1-1/+2
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano1-1/+20
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty1-1/+1
2010-01-11rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty1-1/+1
2010-01-07rebase -i: teach --onto A...B syntaxNanako Shiraishi1-1/+20
2010-01-06rebase -i --autosquash: auto-squash commitsNanako Shiraishi1-0/+37
2009-12-19Merge branch 'maint'Junio C Hamano1-1/+1
2009-12-19rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson1-1/+1
2009-12-07Add a command "fixup" to rebase --interactiveMichael Haggerty1-10/+35
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano1-5/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano1-5/+5
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano1-5/+5
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano1-3/+3
2009-10-28Merge branch 'maint'Junio C Hamano1-1/+6
2009-10-27rebase -i: more graceful handling of invalid commandsJan Krüger1-1/+6
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-3/+3
2009-10-19rebase -i: fix reword when using a terminal editorStephen Boyd1-1/+1
2009-10-07Teach 'rebase -i' the command "reword"Björn Gustavsson1-0/+9
2009-07-22Fix rebase -p --ontoGreg Price1-1/+1
2009-06-11Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maintJunio C Hamano1-1/+1
2009-06-11rebase--interactive: remote stray closing parenthesisUwe Kleine-König1-1/+1
2009-03-03rebase -i: avoid 'git reset' when possibleJohannes Schindelin1-0/+26
2009-01-31Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano1-5/+4
2009-01-28Fix submodule squashing into unrelated commitJohannes Schindelin1-5/+4
2009-01-26rebase -i: correctly remember --root flag across --continueJunio C Hamano1-2/+8
2009-01-25rebase -i --root: fix check for number of argumentsJohannes Schindelin1-1/+2
2009-01-17Merge branch 'tr/rebase-root'Junio C Hamano1-31/+79
2009-01-13Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-01-13Avoid spurious error messages on error mistakes.Pierre Habouzit1-1/+1
2009-01-11rebase -i: learn to rebase root commitThomas Rast1-31/+78
2009-01-03rebase -i: execute hook only after argument checkingThomas Rast1-2/+3
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin1-3/+12
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt1-2/+1
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-05 18:10:32 +0000