summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)Author
2008-03-05am: --rebasingJunio C Hamano
2008-03-02git rebase --abort: always restore the right commitMike Hommey
2007-11-29Merge branch 'maint'Junio C Hamano
2007-11-29scripts: do not get confused with HEAD in work treeJunio C Hamano
2007-11-25Merge branch 'mh/rebase-skip-hard'Junio C Hamano
2007-11-18Merge branch 'ph/parseopt-sh'Junio C Hamano
2007-11-13rebase: fix "rebase --continue" breakageJohannes Schindelin
2007-11-12Do git reset --hard HEAD when using git rebase --skipMike Hommey
2007-11-09rebase: operate on a detached HEADJohannes Schindelin
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-11-02Fixing path quoting in git-rebaseJonathan del Strother
2007-10-18Fixing path quoting in git-rebaseJonathan del Strother
2007-09-24Merge branch 'maint'Junio C Hamano
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-09-08git-rebase: fix -C optionJ. Bruce Fields
2007-09-08git-rebase: support --whitespace=<option>J. Bruce Fields
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt
2007-07-07Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin
2007-07-05Allow rebase to run if upstream is completely mergedJohannes Sixt
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-25Teach rebase an interactive modeJohannes Schindelin
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes
2007-04-14Use rev-list --reverse in git-rebase.shAlex Riesen
2007-03-25Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin
2007-01-31Improved error message from git-rebaseDavid K├ągedal
2007-01-21git-rebase: allow rebasing a detached HEAD.Junio C Hamano
2007-01-13Allow whole-tree operations to be started from a subdirectoryJunio C Hamano
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman
2006-10-04git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman
2006-09-25Deprecate merge-recursive.pyJunio C Hamano
2006-08-13Merge branch 'master' into js/c-merge-recursiveJunio C Hamano
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman
2006-07-31Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano
2006-07-14recur vs recursive: help testing without touching too many stuff.Junio C Hamano
2006-07-14Status update on merge-recursive in CJohannes Schindelin
2006-07-14Record rebase changes as 'rebase' in the reflog.Shawn Pearce
2006-07-08Using 'perl' in *.shMichal Rokos
2006-06-28rebase: check for errors from git-commitEric Wong
2006-06-28rebase: get rid of outdated MRESOLVEMSGEric Wong