summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
2008-02-11rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig-1/+1
2008-01-14Squelch bogus progress output from git-rebase--interactiveJunio C Hamano-2/+7
2007-12-30git-rebase -i: clean-up error check codepath.Junio C Hamano-10/+19
2007-12-30git-rebase -i behaves better on commits with incomplete messagesJunio C Hamano-2/+4
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryShawn O. Pearce-1/+3
2007-12-19Catch and handle git-commit failures in git-rebase --interactiveShawn O. Pearce-8/+9
2007-12-19Avoid update hook during git-rebase --interactiveShawn O. Pearce-2/+2
2007-12-19Fix interactive rebase to preserve author email addressSean-1/+1
2007-12-17rebase -p -i: handle "no changes" gracefullyJohannes Schindelin-1/+6
2007-12-02Merge branch 'js/rebase-i-rerere'Junio C Hamano-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta-0/+5
2007-11-28rebase -i: give rerere a chanceJohannes Schindelin-1/+4
2007-11-28Merge branch 'maint'Junio C Hamano-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeJunio C Hamano-2/+2
2007-11-22rebase -i: move help to end of todo fileJohannes Schindelin-6/+8
2007-11-17Merge branch 'ph/parseopt-sh'Junio C Hamano-0/+1
2007-11-09Merge branch 'maint'Junio C Hamano-1/+1
2007-11-08Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues-1/+1
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano-0/+1
2007-10-30Merge branch 'maint' into HEADJunio C Hamano-3/+4
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink-1/+0
2007-10-16git-rebase--interactive.sh: Quote arguments to testMichael W. Olson-1/+1
2007-10-15Merge branch 'maint'Shawn O. Pearce-2/+2
2007-10-15rebase -i: use diff plumbing instead of porcelainJohannes Schindelin-2/+2
2007-10-03Merge branch 'js/rebase-i'Junio C Hamano-8/+15
2007-10-03Merge branch 'jc/autogc'Junio C Hamano-0/+2
2007-09-29Merge branch 'maint'Junio C Hamano-1/+1
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin-1/+1
2007-09-29rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin-4/+4
2007-09-26rebase -i: work on a detached HEADJohannes Schindelin-8/+15
2007-09-26Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano-0/+2
2007-09-26rebase -i: create .dotest-merge after validating options.Matt Kraai-4/+4
2007-09-25rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin-2/+8
2007-09-25rebase -i: Fix numbers in progress reportJohannes Schindelin-2/+2
2007-09-25rebase -i: style fixes and minor cleanupsJohannes Schindelin-18/+30
2007-09-25rebase -i: commit when continuing after "edit"Johannes Schindelin-6/+11
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup-1/+1
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano-0/+2
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano-1/+1
2007-08-23rebase -i: fix squashing corner caseJohannes Schindelin-2/+3
2007-08-01rebase -i: fix for optional [branch] parameterJohannes Schindelin-1/+1
2007-08-01rebase -i: ignore patches that are already in the upstreamJohannes Schindelin-2/+3
2007-07-28Rename git-rebase interactive buffer: todo => git-rebase-todoSeth Falcon-1/+1
2007-07-27rebase -i: fix interrupted squashingJohannes Schindelin-1/+1
2007-07-25rebase -i: fix overzealous output redirectionJohannes Schindelin-1/+3
2007-07-23rebase -i: exchange all "if [ .. ]" by "if test .."Johannes Schindelin-7/+7
2007-07-23Shut "git rebase -i" up when no --verbose was givenJohannes Schindelin-16/+34
2007-07-21rebase -i: call editor just once for a multi-squashJohannes Schindelin-10/+46