aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-28
* Merge branch 'maint'Junio C Hamano2011-01-27
|\
| * rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder2011-01-27
| * rebase: use explicit "--" with checkoutJeff King2011-01-26
* | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-12
|\ \
| * | rebase: support --verifyMartin von Zweigbergk2010-11-23
| |/
* | Merge branch 'rr/needs-clean-work-tree'Junio C Hamano2010-11-29
|\ \
| * | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-28
| |/
* | rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-09
* | rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-09
|/
* git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen2010-09-17
* Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-31
|\
| * cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-15
* | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-31
|\ \
| * | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-14
* | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-21
|\ \ \
| * | | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-08-13
| * | | git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey2010-08-13
| * | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-11
| | |/ | |/|
* | | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-07-25
|/ /
* | rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2010-07-05
* | rebase-i: style fixJunio C Hamano2010-07-05
|/
* rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-11
* rebase-interactive: silence warning when no commits rewrittenJeff King2010-04-18
* Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-03
|\
| * Teach rebase the --no-ff option.Marc Branchaud2010-03-24
* | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-03
|\ \
| * | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-14
| |/
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|\ \
| * | rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-20
| |/
* | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-28
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ | |/ |/|
| * rebase: support automatic notes copyingThomas Rast2010-03-12
| * rebase -i: invoke post-rewrite hookThomas Rast2010-03-12
| * commit --amend: invoke post-rewrite hookThomas Rast2010-03-12
* | work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano2010-01-26
* | fix portability issues with $ in double quotesStephen Boyd2010-01-26
* | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-23
|/
* rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-22
* Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-20
|\
| * rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-14
| * rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-14
| * rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty2010-01-14
| * rebase -i: Extract function do_with_authorMichael Haggerty2010-01-14
| * rebase -i: Handle the author script all in one place in do_nextMichael Haggerty2010-01-14
| * rebase -i: Extract a function "commit_message"Michael Haggerty2010-01-14
| * rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty2010-01-14
| * rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-14
| * rebase -i: Introduce a constant AMENDMichael Haggerty2010-01-14
| * rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty2010-01-14