summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
2010-07-05rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano-5/+5
2010-07-05rebase-i: style fixJunio C Hamano-5/+6
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort-1/+2
2010-04-18rebase-interactive: silence warning when no commits rewrittenJeff King-0/+1
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano-1/+7
2010-04-03Merge branch 'do/rebase-i-arbitrary'Junio C Hamano-2/+0
2010-03-28Merge branch 'cc/cherry-pick-ff'Junio C Hamano-12/+3
2010-03-28rebase -i: make post-rewrite work for 'edit'Thomas Rast-2/+3
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano-2/+50
2010-03-24Teach rebase the --no-ff option.Marc Branchaud-2/+7
2010-03-20rebase -i: use new --ff cherry-pick optionChristian Couder-12/+3
2010-03-14rebase--interactive: don't require what's rebased to be a branchDave Olszewski-2/+0
2010-03-12rebase: support automatic notes copyingThomas Rast-0/+4
2010-03-12rebase -i: invoke post-rewrite hookThomas Rast-1/+45
2010-03-12commit --amend: invoke post-rewrite hookThomas Rast-1/+1
2010-01-26work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano-3/+3
2010-01-26fix portability issues with $ in double quotesStephen Boyd-1/+1
2010-01-23rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano-4/+4
2010-01-22rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty-1/+1
2010-01-20Merge branch 'mh/rebase-fixup'Junio C Hamano-81/+143
2010-01-20Merge branch 'ns/rebase-auto-squash'Junio C Hamano-0/+37
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano-10/+35
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty-39/+27
2010-01-14rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty-27/+54
2010-01-14rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty-15/+20
2010-01-14rebase -i: Extract function do_with_authorMichael Haggerty-12/+15
2010-01-14rebase -i: Handle the author script all in one place in do_nextMichael Haggerty-2/+2
2010-01-14rebase -i: Extract a function "commit_message"Michael Haggerty-5/+10
2010-01-14rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty-8/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty-1/+1
2010-01-14rebase -i: Introduce a constant AMENDMichael Haggerty-4/+12
2010-01-14rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty-6/+11
2010-01-14rebase -i: Document how temporary files are usedMichael Haggerty-7/+34
2010-01-14rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty-4/+4
2010-01-14rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty-1/+1
2010-01-14rebase -i: Inline expressionMichael Haggerty-2/+1
2010-01-14rebase -i: Remove dead codeMichael Haggerty-1/+0
2010-01-14rebase -i: Make the condition for an "if" more transparentMichael Haggerty-1/+2
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano-1/+20
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty-1/+1
2010-01-11rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty-1/+1
2010-01-07rebase -i: teach --onto A...B syntaxNanako Shiraishi-1/+20
2010-01-06rebase -i --autosquash: auto-squash commitsNanako Shiraishi-0/+37
2009-12-19Merge branch 'maint'Junio C Hamano-1/+1
2009-12-19rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson-1/+1
2009-12-07Add a command "fixup" to rebase --interactiveMichael Haggerty-10/+35
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano-5/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano-5/+5
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano-5/+5
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano-3/+3