aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
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