summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2014-06-16Merge branch 'rr/rebase-autostash-fix'Libravatar Junio C Hamano1-2/+2
2014-05-19rebase -i: handle "Nothing to do" case with autostashLibravatar Ramkumar Ramachandra1-2/+2
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Libravatar Junio C Hamano1-0/+15
2014-04-17rebase: avoid non-function use of "return" on FreeBSDLibravatar Kyle J. McKay1-0/+15
2014-03-25Merge branch 'us/printf-not-echo'Libravatar Junio C Hamano1-1/+1
2014-03-17rebase -i: do not "echo" random user-supplied stringsLibravatar Uwe Storbeck1-1/+1
2014-02-11rebase: add the --gpg-sign optionLibravatar Nicolas Vigier1-13/+26
2013-11-26remove #!interpreter line from shell librariesLibravatar Jonathan Nieder1-6/+3
2013-09-30rebase -i: respect core.abbrevLibravatar Kirill A. Shutemov1-1/+1
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Libravatar Junio C Hamano1-0/+30
2013-09-11Merge branch 'rt/rebase-p-no-merge-summary'Libravatar Junio C Hamano1-1/+2
2013-09-11Merge branch 'es/rebase-i-respect-core-commentchar'Libravatar Junio C Hamano1-1/+1
2013-08-25rebase -i: fix short SHA-1 collisionLibravatar Junio C Hamano1-0/+30
2013-08-21rebase --preserve-merges: ignore "merge.log" configLibravatar Ralf Thielow1-1/+2
2013-08-18rebase -i: fix cases ignoring core.commentcharLibravatar Eric Sunshine1-1/+1
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