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