summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Libravatar Junio C Hamano1-1/+5
2013-07-11Merge branch 'af/rebase-i-merge-options'Libravatar Junio C Hamano1-5/+16
2013-07-02Do not ignore merge options in interactive rebaseLibravatar Arnaud Fontaine1-5/+16
2013-06-27rebase -i: handle fixup! fixup! in --autosquashLibravatar Andrew Pimlott1-5/+20
2013-06-23rebase -i: use a better reflog messageLibravatar Ramkumar Ramachandra1-1/+5
2013-05-12rebase -i: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra1-4/+5
2013-05-12rebase -i: don't error out if $state_dir already existsLibravatar Ramkumar Ramachandra1-1/+1
2013-04-25bash-prompt.sh: show where rebase is at when stoppedLibravatar Zoltan Klinger1-0/+5
2013-02-17Merge branch 'jk/rebase-i-comment-char'Libravatar Junio C Hamano1-40/+44
2013-02-12rebase -i: respect core.commentcharLibravatar John Keeping1-40/+44
2013-01-21Merge branch 'ph/rebase-preserve-all-merges'Libravatar Junio C Hamano1-1/+6
2013-01-14rebase --preserve-merges: keep all merge commits including empty onesLibravatar Phil Hord1-1/+6
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Libravatar Junio C Hamano1-13/+40
2012-09-19rebase -i: suggest using --edit-todo to fix an unknown instructionLibravatar Johannes Sixt1-2/+3
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionLibravatar Johannes Sixt1-0/+4
2012-09-17rebase -i: Teach "--edit-todo" actionLibravatar Andrew Wong1-0/+17
2012-09-17rebase -i: Refactor help messages for todo fileLibravatar Andrew Wong1-11/+20
2012-09-10Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano1-2/+1
2012-09-10Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Libravatar Junio C Hamano1-2/+1
2012-08-29Merge branch 'mg/rebase-i-onto-reflog-in-full'Libravatar Junio C Hamano1-2/+1
2012-08-10rebase -i: use full onto sha1 in reflogLibravatar Michael J Gruber1-2/+1
2012-07-25Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-12/+13
2012-07-24rebase -i: handle fixup of root commit correctlyLibravatar Chris Webb1-12/+13
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-6/+26
2012-07-13Merge branch 'mz/rebase-no-mbox'Libravatar Junio C Hamano1-3/+1
2012-06-26rebase -i: support --root without --ontoLibravatar Chris Webb1-6/+26
2012-06-26rebase: don't source git-sh-setup twiceLibravatar Martin von Zweigbergk1-3/+1
2012-06-13rebase -i: teach "--exec <cmd>"Libravatar Lucien Kong1-0/+23
2012-05-10Merge branch 'nl/rebase-i-cheat-sheet' into maintLibravatar Junio C Hamano1-0/+2
2012-04-30Merge branch 'nh/empty-rebase'Libravatar Junio C Hamano1-3/+32
2012-04-24git-rebase: add keep_empty flagLibravatar Neil Horman1-3/+32
2012-04-23Merge branch 'jk/rebase-i-submodule-conflict-only'Libravatar Junio C Hamano1-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesLibravatar John Keeping1-1/+1
2012-03-20rebase -i: remind that the lines are top-to-bottomLibravatar Junio C Hamano1-0/+2
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintLibravatar Junio C Hamano1-13/+23
2011-12-16Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Libravatar Junio C Hamano1-13/+23
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Libravatar Andrew Wong1-13/+23
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetLibravatar Peter Oberndorfer1-1/+14
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeLibravatar Junio C Hamano1-3/+9
2011-08-26rebase -i: clean error message for --continue after failed execLibravatar Matthieu Moy1-1/+17
2011-06-19rebase -i -p: include non-first-parent commits in todo listLibravatar Andrew Wong1-2/+1
2011-05-27rebase: write a reflog entry when finishingLibravatar Jeff King1-1/+3
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Libravatar Junio C Hamano1-1/+1
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong1-1/+1
2011-02-25Makefile: do not install sourced rebase scriptsLibravatar Martin von Zweigbergk1-0/+0
2011-02-10rebase -i: remove unnecessary state rebase-rootLibravatar Martin von Zweigbergk1-19/+0
2011-02-10rebase -i: don't read unused variable preserve_mergesLibravatar Martin von Zweigbergk1-1/+0
2011-02-10rebase: remember strategy and strategy optionsLibravatar Martin von Zweigbergk1-2/+0
2011-02-10rebase: remember verbose optionLibravatar Martin von Zweigbergk1-2/+0
2011-02-10rebase: extract code for writing basic stateLibravatar Martin von Zweigbergk1-4/+1