summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2007-12-02Merge branch 'js/rebase-i-rerere'Libravatar Junio C Hamano1-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainLibravatar Wincent Colaiuta1-0/+5
2007-11-28rebase -i: give rerere a chanceLibravatar Johannes Schindelin1-1/+4
2007-11-28Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeLibravatar Junio C Hamano1-2/+2
2007-11-22rebase -i: move help to end of todo fileLibravatar Johannes Schindelin1-6/+8
2007-11-17Merge branch 'ph/parseopt-sh'Libravatar Junio C Hamano1-0/+1
2007-11-09Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-11-08Avoid a few unportable, needlessly nested "...`...".Libravatar Ralf Wildenhues1-1/+1
2007-11-06scripts: Add placeholders for OPTIONS_SPECLibravatar Junio C Hamano1-0/+1
2007-10-30Merge branch 'maint' into HEADLibravatar Junio C Hamano1-3/+4
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Libravatar Björn Steinbrink1-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Libravatar Björn Steinbrink1-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shLibravatar Björn Steinbrink1-1/+0
2007-10-16git-rebase--interactive.sh: Quote arguments to testLibravatar Michael W. Olson1-1/+1
2007-10-15Merge branch 'maint'Libravatar Shawn O. Pearce1-2/+2
2007-10-15rebase -i: use diff plumbing instead of porcelainLibravatar Johannes Schindelin1-2/+2
2007-10-03Merge branch 'js/rebase-i'Libravatar Junio C Hamano1-8/+15
2007-10-03Merge branch 'jc/autogc'Libravatar Junio C Hamano1-0/+2
2007-09-29Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitLibravatar Johannes Schindelin1-1/+1
2007-09-29rebase -i: support single-letter abbreviations for the actionsLibravatar Johannes Schindelin1-4/+4
2007-09-26rebase -i: work on a detached HEADLibravatar Johannes Schindelin1-8/+15
2007-09-26Merge branch 'jc/autogc' into js/rebase-iLibravatar Junio C Hamano1-0/+2
2007-09-26rebase -i: create .dotest-merge after validating options.Libravatar Matt Kraai1-4/+4
2007-09-25rebase -i: avoid exporting GIT_AUTHOR_* variablesLibravatar Johannes Schindelin1-2/+8
2007-09-25rebase -i: Fix numbers in progress reportLibravatar Johannes Schindelin1-2/+2
2007-09-25rebase -i: style fixes and minor cleanupsLibravatar Johannes Schindelin1-18/+30
2007-09-25rebase -i: commit when continuing after "edit"Libravatar Johannes Schindelin1-6/+11
2007-09-23Supplant the "while case ... break ;; esac" idiomLibravatar David Kastrup1-1/+1
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Libravatar Junio C Hamano1-0/+2
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Libravatar Junio C Hamano1-1/+1
2007-08-23rebase -i: fix squashing corner caseLibravatar Johannes Schindelin1-2/+3
2007-08-01rebase -i: fix for optional [branch] parameterLibravatar Johannes Schindelin1-1/+1
2007-08-01rebase -i: ignore patches that are already in the upstreamLibravatar Johannes Schindelin1-2/+3
2007-07-28Rename git-rebase interactive buffer: todo => git-rebase-todoLibravatar Seth Falcon1-1/+1
2007-07-27rebase -i: fix interrupted squashingLibravatar Johannes Schindelin1-1/+1
2007-07-25rebase -i: fix overzealous output redirectionLibravatar Johannes Schindelin1-1/+3
2007-07-23rebase -i: exchange all "if [ .. ]" by "if test .."Libravatar Johannes Schindelin1-7/+7
2007-07-23Shut "git rebase -i" up when no --verbose was givenLibravatar Johannes Schindelin1-16/+34
2007-07-21rebase -i: call editor just once for a multi-squashLibravatar Johannes Schindelin1-10/+46
2007-07-20Add GIT_EDITOR environment and core.editor configuration variablesLibravatar Adam Roben1-1/+1
2007-07-13Fix git-rebase -i to allow squashing of fast-forwardable commitsLibravatar Alex Riesen1-2/+3
2007-07-08rebase -i: put a nice warning into the todo listLibravatar Johannes Schindelin1-0/+3
2007-07-08rebase -i: remember the settings of -v, -s and -p when interruptedLibravatar Johannes Schindelin1-0/+4
2007-07-08rebase -i: actually show the diffstat when being verboseLibravatar Johannes Schindelin1-4/+4
2007-07-08rebase -i: handle --continue more like non-interactive rebaseLibravatar Johannes Schindelin1-9/+17
2007-06-26Teach rebase -i about --preserve-mergesLibravatar Johannes Schindelin1-3/+107
2007-06-26rebase -i: provide reasonable reflog for the rebased branchLibravatar Johannes Schindelin1-2/+8
2007-06-26rebase -i: several cleanupsLibravatar Johannes Schindelin1-4/+15