| Commit message (Expand) | Author | Age | Files | Lines |
* | Improve error output of git-rebase | Stephan Beyer | 2008-08-16 | 1 | -5/+16 |
* | Rename .git/rebase to .git/rebase-apply | Johannes Schindelin | 2008-07-21 | 1 | -23/+25 |
* | Merge branch 'rs/rebase-checkout-not-so-quiet' | Junio C Hamano | 2008-07-16 | 1 | -2/+1 |
|\ |
|
| * | git-rebase: report checkout failure | Junio C Hamano | 2008-07-14 | 1 | -3/+1 |
* | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 1 | -22/+22 |
* | | Teach "am" and "rebase" to mark the original position with ORIG_HEAD | Junio C Hamano | 2008-07-07 | 1 | -1/+1 |
|/ |
|
* | git-rebase.sh: Add check if rebase is in progress | Stephan Beyer | 2008-06-22 | 1 | -4/+10 |
* | Ignore dirty submodule states during rebase and stash | Johannes Schindelin | 2008-05-15 | 1 | -4/+4 |
* | Merge branch 'bd/tests' | Junio C Hamano | 2008-05-14 | 1 | -1/+1 |
|\ |
|
| * | git-rebase.sh: Fix --merge --abort failures when path contains whitespace | Bryan Donlan | 2008-05-05 | 1 | -1/+1 |
* | | fix bsd shell negation | Jeff King | 2008-05-13 | 1 | -1/+1 |
|/ |
|
* | rebase [--onto O] A B: omit needless checkout | Junio C Hamano | 2008-03-16 | 1 | -20/+32 |
* | Merge branch 'maint' | Junio C Hamano | 2008-03-16 | 1 | -1/+1 |
|\ |
|
| * | rebase -m: do not trigger pre-commit verification | Junio C Hamano | 2008-03-16 | 1 | -1/+1 |
| * | git rebase --abort: always restore the right commit | Mike Hommey | 2008-03-11 | 1 | -3/+2 |
* | | update 'git rebase' documentation | SZEDER Gábor | 2008-03-10 | 1 | -2/+1 |
* | | am: --rebasing | Junio C Hamano | 2008-03-05 | 1 | -1/+1 |
* | | git rebase --abort: always restore the right commit | Mike Hommey | 2008-03-01 | 1 | -3/+2 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2007-11-28 | 1 | -2/+2 |
|\ |
|
| * | scripts: do not get confused with HEAD in work tree | Junio C Hamano | 2007-11-28 | 1 | -2/+2 |
| * | Fixing path quoting in git-rebase | Jonathan del Strother | 2007-11-02 | 1 | -13/+13 |
* | | Merge branch 'mh/rebase-skip-hard' | Junio C Hamano | 2007-11-24 | 1 | -0/+1 |
|\ \ |
|
| * | | Do git reset --hard HEAD when using git rebase --skip | Mike Hommey | 2007-11-11 | 1 | -0/+1 |
* | | | Merge branch 'ph/parseopt-sh' | Junio C Hamano | 2007-11-17 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 2007-11-06 | 1 | -0/+1 |
| |/ / |
|
* | | | rebase: fix "rebase --continue" breakage | Johannes Schindelin | 2007-11-12 | 1 | -1/+5 |
* | | | rebase: operate on a detached HEAD | Johannes Schindelin | 2007-11-09 | 1 | -5/+51 |
|/ / |
|
* | | Fixing path quoting in git-rebase | Jonathan del Strother | 2007-10-18 | 1 | -13/+13 |
* | | Merge branch 'maint' | Junio C Hamano | 2007-09-23 | 1 | -3/+2 |
|\ \
| |/ |
|
| * | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 2007-09-23 | 1 | -3/+2 |
* | | git-rebase: fix -C option | J. Bruce Fields | 2007-09-07 | 1 | -1/+0 |
* | | git-rebase: support --whitespace=<option> | J. Bruce Fields | 2007-09-07 | 1 | -1/+4 |
|/ |
|
* | Avoid one-or-more (\+) non BRE in sed scripts. | Junio C Hamano | 2007-09-01 | 1 | -4/+1 |
* | rebase -m: Fix incorrect short-logs of already applied commits. | Johannes Sixt | 2007-09-01 | 1 | -5/+8 |
* | Enable "git rerere" by the config variable rerere.enabled | Johannes Schindelin | 2007-07-06 | 1 | -9/+3 |
* | Allow rebase to run if upstream is completely merged | Johannes Sixt | 2007-07-04 | 1 | -3/+5 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 1 | -19/+19 |
* | Teach rebase an interactive mode | Johannes Schindelin | 2007-06-24 | 1 | -1/+11 |
* | git-rebase: suggest to use git-add instead of git-update-index | Jonas Fonseca | 2007-06-02 | 1 | -2/+2 |
* | Add colour support in rebase and merge tree diff stats output. | James Bowes | 2007-05-10 | 1 | -1/+2 |
* | Use rev-list --reverse in git-rebase.sh | Alex Riesen | 2007-04-13 | 1 | -2/+1 |
* | Use diff* with --exit-code in git-am, git-rebase and git-merge-ours | Alex Riesen | 2007-03-24 | 1 | -6/+4 |
* | git-rebase: make 'rebase HEAD branch' work as expected. | Junio C Hamano | 2007-03-22 | 1 | -4/+4 |
* | add -C[NUM] to git-am | Michael S. Tsirkin | 2007-02-08 | 1 | -1/+6 |
* | Improved error message from git-rebase | David Kågedal | 2007-01-31 | 1 | -1/+2 |
* | git-rebase: allow rebasing a detached HEAD. | Junio C Hamano | 2007-01-20 | 1 | -2/+6 |
* | Allow whole-tree operations to be started from a subdirectory | Junio C Hamano | 2007-01-12 | 1 | -0/+3 |
* | Disallow working directory commands in a bare repository. | Shawn O. Pearce | 2007-01-10 | 1 | -0/+1 |
* | Use branch names in 'git-rebase -m' conflict hunks. | Shawn O. Pearce | 2006-12-28 | 1 | -1/+10 |
* | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 2006-12-28 | 1 | -6/+4 |