summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* Improve error output of git-rebaseStephan Beyer2008-08-161-5/+16
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-211-23/+25
* Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano2008-07-161-2/+1
|\
| * git-rebase: report checkout failureJunio C Hamano2008-07-141-3/+1
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-22/+22
* | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-071-1/+1
|/
* git-rebase.sh: Add check if rebase is in progressStephan Beyer2008-06-221-4/+10
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-151-4/+4
* Merge branch 'bd/tests'Junio C Hamano2008-05-141-1/+1
|\
| * git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan2008-05-051-1/+1
* | fix bsd shell negationJeff King2008-05-131-1/+1
|/
* rebase [--onto O] A B: omit needless checkoutJunio C Hamano2008-03-161-20/+32
* Merge branch 'maint'Junio C Hamano2008-03-161-1/+1
|\
| * rebase -m: do not trigger pre-commit verificationJunio C Hamano2008-03-161-1/+1
| * git rebase --abort: always restore the right commitMike Hommey2008-03-111-3/+2
* | update 'git rebase' documentationSZEDER Gábor2008-03-101-2/+1
* | am: --rebasingJunio C Hamano2008-03-051-1/+1
* | git rebase --abort: always restore the right commitMike Hommey2008-03-011-3/+2
|/
* 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
| * Fixing path quoting in git-rebaseJonathan del Strother2007-11-021-13/+13
* | Merge branch 'mh/rebase-skip-hard'Junio C Hamano2007-11-241-0/+1
|\ \
| * | Do git reset --hard HEAD when using git rebase --skipMike Hommey2007-11-111-0/+1
* | | Merge branch 'ph/parseopt-sh'Junio C Hamano2007-11-171-0/+1
|\ \ \
| * | | scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
| |/ /
* | | rebase: fix "rebase --continue" breakageJohannes Schindelin2007-11-121-1/+5
* | | rebase: operate on a detached HEADJohannes Schindelin2007-11-091-5/+51
|/ /
* | Fixing path quoting in git-rebaseJonathan del Strother2007-10-181-13/+13
* | Merge branch 'maint'Junio C Hamano2007-09-231-3/+2
|\ \ | |/
| * Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-3/+2
* | git-rebase: fix -C optionJ. Bruce Fields2007-09-071-1/+0
* | git-rebase: support --whitespace=<option>J. Bruce Fields2007-09-071-1/+4
|/
* Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano2007-09-011-4/+1
* rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt2007-09-011-5/+8
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-9/+3
* Allow rebase to run if upstream is completely mergedJohannes Sixt2007-07-041-3/+5
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-19/+19
* Teach rebase an interactive modeJohannes Schindelin2007-06-241-1/+11
* git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca2007-06-021-2/+2
* Add colour support in rebase and merge tree diff stats output.James Bowes2007-05-101-1/+2
* Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-131-2/+1
* Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen2007-03-241-6/+4
* git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano2007-03-221-4/+4
* add -C[NUM] to git-amMichael S. Tsirkin2007-02-081-1/+6
* Improved error message from git-rebaseDavid Kågedal2007-01-311-1/+2
* git-rebase: allow rebasing a detached HEAD.Junio C Hamano2007-01-201-2/+6
* Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-121-0/+3
* Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-101-0/+1
* Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce2006-12-281-1/+10
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-6/+4
View Lorry Controller Status