summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder-6/+3
2013-09-30rebase -i: respect core.abbrevKirill A. Shutemov-1/+1
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano-0/+30
2013-09-11Merge branch 'rt/rebase-p-no-merge-summary'Junio C Hamano-1/+2
2013-09-11Merge branch 'es/rebase-i-respect-core-commentchar'Junio C Hamano-1/+1
2013-08-25rebase -i: fix short SHA-1 collisionJunio C Hamano-0/+30
2013-08-21rebase --preserve-merges: ignore "merge.log" configRalf Thielow-1/+2
2013-08-18rebase -i: fix cases ignoring core.commentcharEric Sunshine-1/+1
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano-1/+5
2013-07-11Merge branch 'af/rebase-i-merge-options'Junio C Hamano-5/+16
2013-07-02Do not ignore merge options in interactive rebaseArnaud Fontaine-5/+16
2013-06-27rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott-5/+20
2013-06-23rebase -i: use a better reflog messageRamkumar Ramachandra-1/+5
2013-05-12rebase -i: return control to caller, for housekeepingRamkumar Ramachandra-4/+5
2013-05-12rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra-1/+1
2013-04-25bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger-0/+5
2013-02-17Merge branch 'jk/rebase-i-comment-char'Junio C Hamano-40/+44
2013-02-12rebase -i: respect core.commentcharJohn Keeping-40/+44
2013-01-21Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano-1/+6
2013-01-14rebase --preserve-merges: keep all merge commits including empty onesPhil Hord-1/+6
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano-13/+40
2012-09-19rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt-2/+3
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt-0/+4
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong-0/+17
2012-09-17rebase -i: Refactor help messages for todo fileAndrew Wong-11/+20
2012-09-10Merge branch 'maint-1.7.11' into maintJunio C Hamano-2/+1
2012-09-10Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano-2/+1
2012-08-29Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano-2/+1
2012-08-10rebase -i: use full onto sha1 in reflogMichael J Gruber-2/+1
2012-07-25Merge branch 'cw/rebase-i-root'Junio C Hamano-12/+13
2012-07-24rebase -i: handle fixup of root commit correctlyChris Webb-12/+13
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano-6/+26
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano-3/+1
2012-06-26rebase -i: support --root without --ontoChris Webb-6/+26
2012-06-26rebase: don't source git-sh-setup twiceMartin von Zweigbergk-3/+1
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong-0/+23
2012-05-10Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano-0/+2
2012-04-30Merge branch 'nh/empty-rebase'Junio C Hamano-3/+32
2012-04-24git-rebase: add keep_empty flagNeil Horman-3/+32
2012-04-23Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping-1/+1
2012-03-20rebase -i: remind that the lines are top-to-bottomJunio C Hamano-0/+2
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano-13/+23
2011-12-16Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano-13/+23
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong-13/+23
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer-1/+14
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano-3/+9
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy-1/+17
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong-2/+1
2011-05-27rebase: write a reflog entry when finishingJeff King-1/+3