aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* Improved error message from git-rebaseDavid Kågedal2007-01-31
* git-rebase: allow rebasing a detached HEAD.Junio C Hamano2007-01-20
* Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-12
* Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-10
* Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce2006-12-28
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-28
* merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-22
* rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-09
* remove merge-recursive-oldJunio C Hamano2006-11-21
* git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman2006-10-04
* git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman2006-10-04
* Deprecate merge-recursive.pyJunio C Hamano2006-09-24
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-12
|\
| * rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman2006-07-31
| * rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman2006-07-31
* | Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-30
|\ \ | |/
| * Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-13
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-13
* | Status update on merge-recursive in CJohannes Schindelin2006-07-13
|/
* Using 'perl' in *.shMichal Rokos2006-07-08
* rebase: check for errors from git-commitEric Wong2006-06-28
* rebase: get rid of outdated MRESOLVEMSGEric Wong2006-06-28
* Fix expr usage for FreeBSDDennis Stosberg2006-06-27
* rebase: allow --skip to work with --mergeEric Wong2006-06-25
* rebase: cleanup rebasing with --mergeEric Wong2006-06-25
* rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-25
* rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano2006-06-22
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-21
* rebase: Allow merge strategies to be used when rebasingEric Wong2006-06-21
* git-rebase: use canonical A..B syntax to format-patchJunio C Hamano2006-05-21
* Make git rebase interactive help match documentation.Sean2006-05-14
* Add --continue and --abort options to git-rebase.sean2006-04-26
* rebase: typofix.Junio C Hamano2006-04-26
* Shell utilities: Guard against expr' magic tokens.Mark Wooding2006-04-13
* Fix typo in git-rebase.sh.Jason Riedy2006-02-21
* git-rebase: Clarify usage statement and copy it into the actual documentation.Carl Worth2006-02-21
* Merge branch 'jc/rebase-limit'Junio C Hamano2006-02-18
|\
| * rebase: allow rebasing onto different base.Junio C Hamano2006-02-14
* | rebase: allow a hook to refuse rebasing.Junio C Hamano2006-02-13
|/
* Bugfixes for git-rebaseLukas Sandström2005-12-14
* rebase: do not get confused in fast-forward situation.Junio C Hamano2005-12-14
* git-rebase: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se2005-12-14
* rebase: one safety net, one bugfix and one optimization.Junio C Hamano2005-11-28
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-25
* Rewrite rebase to use git-format-patch piped to git-am.Junio C Hamano2005-11-18
* Use git-update-ref in scripts.Junio C Hamano2005-09-28
* Big tool rename.Junio C Hamano2005-09-07