summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2007-07-04Allow rebase to run if upstream is completely mergedLibravatar Johannes Sixt1-3/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-19/+19
2007-06-24Teach rebase an interactive modeLibravatar Johannes Schindelin1-1/+11
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexLibravatar Jonas Fonseca1-2/+2
2007-05-10Add colour support in rebase and merge tree diff stats output.Libravatar James Bowes1-1/+2
2007-04-13Use rev-list --reverse in git-rebase.shLibravatar Alex Riesen1-2/+1
2007-03-24Use diff* with --exit-code in git-am, git-rebase and git-merge-oursLibravatar Alex Riesen1-6/+4
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Libravatar Junio C Hamano1-4/+4
2007-02-08add -C[NUM] to git-amLibravatar Michael S. Tsirkin1-1/+6
2007-01-31Improved error message from git-rebaseLibravatar David Kågedal1-1/+2
2007-01-20git-rebase: allow rebasing a detached HEAD.Libravatar Junio C Hamano1-2/+6
2007-01-12Allow whole-tree operations to be started from a subdirectoryLibravatar Junio C Hamano1-0/+3
2007-01-10Disallow working directory commands in a bare repository.Libravatar Shawn O. Pearce1-0/+1
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Libravatar Shawn O. Pearce1-1/+10
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-6/+4
2006-12-22merge and reset: adjust for "reset --hard" messagesLibravatar Junio C Hamano1-0/+1
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amLibravatar Eric Wong1-0/+8
2006-11-21remove merge-recursive-oldLibravatar Junio C Hamano1-9/+0
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Libravatar Robert Shearman1-1/+11
2006-10-04git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Libravatar Robert Shearman1-1/+1
2006-09-24Deprecate merge-recursive.pyLibravatar Junio C Hamano1-15/+4
2006-08-12Merge branch 'master' into js/c-merge-recursiveLibravatar Junio C Hamano1-9/+6
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Libravatar Robert Shearman1-1/+1
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Libravatar Robert Shearman1-8/+5
2006-07-30Merge branch 'js/read-tree' into js/c-merge-recursiveLibravatar Junio C Hamano1-3/+6
2006-07-13recur vs recursive: help testing without touching too many stuff.Libravatar Junio C Hamano1-2/+13
2006-07-13Status update on merge-recursive in CLibravatar Johannes Schindelin1-2/+2
2006-07-13Record rebase changes as 'rebase' in the reflog.Libravatar Shawn Pearce1-3/+6
2006-07-08Using 'perl' in *.shLibravatar Michal Rokos1-1/+1
2006-06-28rebase: check for errors from git-commitLibravatar Eric Wong1-1/+6
2006-06-28rebase: get rid of outdated MRESOLVEMSGLibravatar Eric Wong1-8/+3
2006-06-27Fix expr usage for FreeBSDLibravatar Dennis Stosberg1-1/+1
2006-06-25rebase: allow --skip to work with --mergeLibravatar Eric Wong1-1/+12
2006-06-25rebase: cleanup rebasing with --mergeLibravatar Eric Wong1-28/+5
2006-06-25rebase: allow --merge option to handle patches merged upstreamLibravatar Eric Wong1-4/+11
2006-06-22rebase --merge: fix for rebasing more than 7 commits.Libravatar Junio C Hamano1-13/+10
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeLibravatar Eric Wong1-0/+9
2006-06-21rebase: Allow merge strategies to be used when rebasingLibravatar Eric Wong1-9/+183
2006-05-21git-rebase: use canonical A..B syntax to format-patchLibravatar Junio C Hamano1-1/+1
2006-05-14Make git rebase interactive help match documentation.Libravatar Sean1-5/+16
2006-04-26Add --continue and --abort options to git-rebase.Libravatar sean1-24/+38
2006-04-26rebase: typofix.Libravatar Junio C Hamano1-1/+1
2006-04-13Shell utilities: Guard against expr' magic tokens.Libravatar Mark Wooding1-1/+1
2006-02-21Fix typo in git-rebase.sh.Libravatar Jason Riedy1-1/+1
2006-02-21git-rebase: Clarify usage statement and copy it into the actual documentation.Libravatar Carl Worth1-10/+14
2006-02-18Merge branch 'jc/rebase-limit'Libravatar Junio C Hamano1-18/+71
2006-02-14rebase: allow rebasing onto different base.Libravatar Junio C Hamano1-18/+71
2006-02-13rebase: allow a hook to refuse rebasing.Libravatar Junio C Hamano1-0/+9
2005-12-14Bugfixes for git-rebaseLibravatar Lukas Sandström1-11/+18
2005-12-14rebase: do not get confused in fast-forward situation.Libravatar Junio C Hamano1-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 06:33:29 +0000