path: root/
AgeCommit message (Expand)Author
2007-12-03Merge branch 'js/rebase-i-rerere'Junio C Hamano
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta
2007-11-29rebase -i: give rerere a chanceJohannes Schindelin
2007-11-29Merge branch 'maint'Junio C Hamano
2007-11-29scripts: do not get confused with HEAD in work treeJunio C Hamano
2007-11-22rebase -i: move help to end of todo fileJohannes Schindelin
2007-11-18Merge branch 'ph/parseopt-sh'Junio C Hamano
2007-11-09Merge branch 'maint'Junio C Hamano
2007-11-08Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-10-31Merge branch 'maint' into HEADJunio C Hamano Make 3-way merge strategies work for -p.Björn Steinbrink Don't pass a strategy to git-cherry-pick.Björn Steinbrink
2007-10-31Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink Quote arguments to testMichael W. Olson
2007-10-16Merge branch 'maint'Shawn O. Pearce
2007-10-16rebase -i: use diff plumbing instead of porcelainJohannes Schindelin
2007-10-03Merge branch 'js/rebase-i'Junio C Hamano
2007-10-03Merge branch 'jc/autogc'Junio C Hamano
2007-09-30Merge branch 'maint'Junio C Hamano
2007-09-30rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin
2007-09-30rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin
2007-09-26rebase -i: work on a detached HEADJohannes Schindelin
2007-09-26Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano
2007-09-26rebase -i: create .dotest-merge after validating options.Matt Kraai
2007-09-26rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin
2007-09-26rebase -i: Fix numbers in progress reportJohannes Schindelin
2007-09-26rebase -i: style fixes and minor cleanupsJohannes Schindelin
2007-09-26rebase -i: commit when continuing after "edit"Johannes Schindelin
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano
2007-08-23rebase -i: fix squashing corner caseJohannes Schindelin
2007-08-02rebase -i: fix for optional [branch] parameterJohannes Schindelin
2007-08-02rebase -i: ignore patches that are already in the upstreamJohannes Schindelin
2007-07-29Rename git-rebase interactive buffer: todo => git-rebase-todoSeth Falcon
2007-07-27rebase -i: fix interrupted squashingJohannes Schindelin
2007-07-26rebase -i: fix overzealous output redirectionJohannes Schindelin
2007-07-24rebase -i: exchange all "if [ .. ]" by "if test .."Johannes Schindelin
2007-07-24Shut "git rebase -i" up when no --verbose was givenJohannes Schindelin
2007-07-21rebase -i: call editor just once for a multi-squashJohannes Schindelin
2007-07-20Add GIT_EDITOR environment and core.editor configuration variablesAdam Roben
2007-07-14Fix git-rebase -i to allow squashing of fast-forwardable commitsAlex Riesen
2007-07-09rebase -i: put a nice warning into the todo listJohannes Schindelin
2007-07-09rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin
2007-07-09rebase -i: actually show the diffstat when being verboseJohannes Schindelin
2007-07-09rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin
2007-06-27Teach rebase -i about --preserve-mergesJohannes Schindelin
2007-06-27rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin
2007-06-27rebase -i: several cleanupsJohannes Schindelin