aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* rebase: consistent error messages for staged and unstaged changes.Matthieu Moy2009-08-06
* Merge branch 'sb/quiet-porcelains'Junio C Hamano2009-07-01
|\
| * am, rebase: teach quiet optionStephen Boyd2009-06-18
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-14
|/
* rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio2009-03-27
* rebase: add options passed to git-amMichele Ballabio2009-03-18
* Merge branch 'tv/rebase-stat'Junio C Hamano2009-03-11
|\
| * git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø2009-03-02
* | Merge branch 'sr/force-rebase'Junio C Hamano2009-03-05
|\ \ | |/ |/|
| * Teach rebase to rebase even if upstream is up to dateSverre Rabbelier2009-02-13
* | disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian2009-02-18
|/
* rebase: learn to rebase root commitThomas Rast2009-01-11
* rebase: improve error messages about dirty stateJeff King2008-12-10
* rebase: use git rev-parse -qMiklos Vajna2008-12-03
* Merge branch 'ae/preservemerge'Junio C Hamano2008-10-19
|\
| * rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-30
* | rebase --no-verifyNanako Shiraishi2008-10-06
* | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-06
|/
* Improve error output of git-rebaseStephan Beyer2008-08-16
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-21
* Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano2008-07-16
|\
| * git-rebase: report checkout failureJunio C Hamano2008-07-14
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-15
* | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-07
|/
* git-rebase.sh: Add check if rebase is in progressStephan Beyer2008-06-22
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-15
* Merge branch 'bd/tests'Junio C Hamano2008-05-14
|\
| * git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan2008-05-05
* | fix bsd shell negationJeff King2008-05-13
|/
* rebase [--onto O] A B: omit needless checkoutJunio C Hamano2008-03-16
* Merge branch 'maint'Junio C Hamano2008-03-16
|\
| * rebase -m: do not trigger pre-commit verificationJunio C Hamano2008-03-16
| * git rebase --abort: always restore the right commitMike Hommey2008-03-11
* | update 'git rebase' documentationSZEDER Gábor2008-03-10
* | am: --rebasingJunio C Hamano2008-03-05
* | git rebase --abort: always restore the right commitMike Hommey2008-03-01
|/
* Merge branch 'maint'Junio C Hamano2007-11-28
|\
| * scripts: do not get confused with HEAD in work treeJunio C Hamano2007-11-28
| * Fixing path quoting in git-rebaseJonathan del Strother2007-11-02
* | Merge branch 'mh/rebase-skip-hard'Junio C Hamano2007-11-24
|\ \
| * | Do git reset --hard HEAD when using git rebase --skipMike Hommey2007-11-11
* | | Merge branch 'ph/parseopt-sh'Junio C Hamano2007-11-17
|\ \ \
| * | | scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-06
| |/ /
* | | rebase: fix "rebase --continue" breakageJohannes Schindelin2007-11-12
* | | rebase: operate on a detached HEADJohannes Schindelin2007-11-09
|/ /
* | Fixing path quoting in git-rebaseJonathan del Strother2007-10-18
* | Merge branch 'maint'Junio C Hamano2007-09-23
|\ \ | |/
| * Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-23
* | git-rebase: fix -C optionJ. Bruce Fields2007-09-07
* | git-rebase: support --whitespace=<option>J. Bruce Fields2007-09-07
|/