summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-221-0/+1
* rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-091-0/+8
* remove merge-recursive-oldJunio C Hamano2006-11-211-9/+0
* git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman2006-10-041-1/+11
* git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman2006-10-041-1/+1
* Deprecate merge-recursive.pyJunio C Hamano2006-09-241-15/+4
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-121-9/+6
|\
| * rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman2006-07-311-1/+1
| * rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman2006-07-311-8/+5
* | Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-301-3/+6
|\ \ | |/
| * Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-131-3/+6
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-131-2/+13
* | Status update on merge-recursive in CJohannes Schindelin2006-07-131-2/+2
|/
* Using 'perl' in *.shMichal Rokos2006-07-081-1/+1
* rebase: check for errors from git-commitEric Wong2006-06-281-1/+6
* rebase: get rid of outdated MRESOLVEMSGEric Wong2006-06-281-8/+3
* Fix expr usage for FreeBSDDennis Stosberg2006-06-271-1/+1
* rebase: allow --skip to work with --mergeEric Wong2006-06-251-1/+12
* rebase: cleanup rebasing with --mergeEric Wong2006-06-251-28/+5
* rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-251-4/+11
* rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano2006-06-221-13/+10
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-211-0/+9
* rebase: Allow merge strategies to be used when rebasingEric Wong2006-06-211-9/+183
* git-rebase: use canonical A..B syntax to format-patchJunio C Hamano2006-05-211-1/+1
* Make git rebase interactive help match documentation.Sean2006-05-141-5/+16
* Add --continue and --abort options to git-rebase.sean2006-04-261-24/+38
* rebase: typofix.Junio C Hamano2006-04-261-1/+1
* Shell utilities: Guard against expr' magic tokens.Mark Wooding2006-04-131-1/+1
* Fix typo in git-rebase.sh.Jason Riedy2006-02-211-1/+1
* git-rebase: Clarify usage statement and copy it into the actual documentation.Carl Worth2006-02-211-10/+14
* Merge branch 'jc/rebase-limit'Junio C Hamano2006-02-181-18/+71
|\
| * rebase: allow rebasing onto different base.Junio C Hamano2006-02-141-18/+71
* | rebase: allow a hook to refuse rebasing.Junio C Hamano2006-02-131-0/+9
|/
* Bugfixes for git-rebaseLukas Sandström2005-12-141-11/+18
* rebase: do not get confused in fast-forward situation.Junio C Hamano2005-12-141-0/+3
* git-rebase: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se2005-12-141-2/+3
* rebase: one safety net, one bugfix and one optimization.Junio C Hamano2005-11-281-1/+27
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-251-1/+1
* Rewrite rebase to use git-format-patch piped to git-am.Junio C Hamano2005-11-181-56/+16
* Use git-update-ref in scripts.Junio C Hamano2005-09-281-2/+3
* Big tool rename.Junio C Hamano2005-09-071-0/+68
View Lorry Controller Status