summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-i-rerere'Junio C Hamano2007-12-021-1/+4
|\
| * rebase -i: give rerere a chanceJohannes Schindelin2007-11-281-1/+4
* | revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta2007-11-301-0/+5
|/
* Merge branch 'maint'Junio C Hamano2007-11-281-2/+2
|\
| * scripts: do not get confused with HEAD in work treeJunio C Hamano2007-11-281-2/+2
* | rebase -i: move help to end of todo fileJohannes Schindelin2007-11-221-6/+8
* | Merge branch 'ph/parseopt-sh'Junio C Hamano2007-11-171-0/+1
|\ \
| * | scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* | | Merge branch 'maint'Junio C Hamano2007-11-091-1/+1
|\ \ \ | |/ / |/| / | |/
| * Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues2007-11-081-1/+1
* | Merge branch 'maint' into HEADJunio C Hamano2007-10-301-3/+4
|\ \ | |/
| * git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink2007-10-301-0/+2
| * git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink2007-10-301-2/+2
| * Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink2007-10-301-1/+0
* | git-rebase--interactive.sh: Quote arguments to testMichael W. Olson2007-10-161-1/+1
* | Merge branch 'maint'Shawn O. Pearce2007-10-151-2/+2
|\ \ | |/
| * rebase -i: use diff plumbing instead of porcelainJohannes Schindelin2007-10-151-2/+2
* | Merge branch 'js/rebase-i'Junio C Hamano2007-10-031-8/+15
|\ \
| * | rebase -i: work on a detached HEADJohannes Schindelin2007-09-261-8/+15
| * | Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano2007-09-261-0/+2
| |\ \
* | \ \ Merge branch 'jc/autogc'Junio C Hamano2007-10-031-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano2007-09-061-0/+2
* | | | Merge branch 'maint'Junio C Hamano2007-09-291-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-291-1/+1
* | | | rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin2007-09-291-4/+4
| |_|/ |/| |
* | | rebase -i: create .dotest-merge after validating options.Matt Kraai2007-09-261-4/+4
* | | rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin2007-09-251-2/+8
* | | rebase -i: Fix numbers in progress reportJohannes Schindelin2007-09-251-2/+2
* | | rebase -i: style fixes and minor cleanupsJohannes Schindelin2007-09-251-18/+30
* | | rebase -i: commit when continuing after "edit"Johannes Schindelin2007-09-251-6/+11
|/ /
* | Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-1/+1
|/
* Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano2007-09-011-1/+1
* rebase -i: fix squashing corner caseJohannes Schindelin2007-08-231-2/+3
* rebase -i: fix for optional [branch] parameterJohannes Schindelin2007-08-011-1/+1
* rebase -i: ignore patches that are already in the upstreamJohannes Schindelin2007-08-011-2/+3
* Rename git-rebase interactive buffer: todo => git-rebase-todoSeth Falcon2007-07-281-1/+1
* rebase -i: fix interrupted squashingJohannes Schindelin2007-07-271-1/+1
* rebase -i: fix overzealous output redirectionJohannes Schindelin2007-07-251-1/+3
* rebase -i: exchange all "if [ .. ]" by "if test .."Johannes Schindelin2007-07-231-7/+7
* Shut "git rebase -i" up when no --verbose was givenJohannes Schindelin2007-07-231-16/+34
* rebase -i: call editor just once for a multi-squashJohannes Schindelin2007-07-211-10/+46
* Add GIT_EDITOR environment and core.editor configuration variablesAdam Roben2007-07-201-1/+1
* Fix git-rebase -i to allow squashing of fast-forwardable commitsAlex Riesen2007-07-131-2/+3
* rebase -i: put a nice warning into the todo listJohannes Schindelin2007-07-081-0/+3
* rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin2007-07-081-0/+4
* rebase -i: actually show the diffstat when being verboseJohannes Schindelin2007-07-081-4/+4
* rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin2007-07-081-9/+17
* Teach rebase -i about --preserve-mergesJohannes Schindelin2007-06-261-3/+107
* rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin2007-06-261-2/+8
* rebase -i: several cleanupsJohannes Schindelin2007-06-261-4/+15
View Lorry Controller Status