summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano1-4/+1
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt1-5/+8
2007-07-06Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin1-9/+3
2007-07-04Allow rebase to run if upstream is completely mergedJohannes Sixt1-3/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-19/+19
2007-06-24Teach rebase an interactive modeJohannes Schindelin1-1/+11
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca1-2/+2
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes1-1/+2
2007-04-13Use rev-list --reverse in git-rebase.shAlex Riesen1-2/+1
2007-03-24Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen1-6/+4
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano1-4/+4
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin1-1/+6
2007-01-31Improved error message from git-rebaseDavid Kågedal1-1/+2
2007-01-20git-rebase: allow rebasing a detached HEAD.Junio C Hamano1-2/+6
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano1-0/+3
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce1-0/+1
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce1-1/+10
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce1-6/+4
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano1-0/+1
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong1-0/+8
2006-11-21remove merge-recursive-oldJunio C Hamano1-9/+0
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman1-1/+11
2006-10-04git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman1-1/+1
2006-09-24Deprecate merge-recursive.pyJunio C Hamano1-15/+4
2006-08-12Merge branch 'master' into js/c-merge-recursiveJunio C Hamano1-9/+6
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman1-1/+1
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman1-8/+5
2006-07-30Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano1-3/+6
2006-07-13recur vs recursive: help testing without touching too many stuff.Junio C Hamano1-2/+13
2006-07-13Status update on merge-recursive in CJohannes Schindelin1-2/+2
2006-07-13Record rebase changes as 'rebase' in the reflog.Shawn Pearce1-3/+6
2006-07-08Using 'perl' in *.shMichal Rokos1-1/+1
2006-06-28rebase: check for errors from git-commitEric Wong1-1/+6
2006-06-28rebase: get rid of outdated MRESOLVEMSGEric Wong1-8/+3
2006-06-27Fix expr usage for FreeBSDDennis Stosberg1-1/+1
2006-06-25rebase: allow --skip to work with --mergeEric Wong1-1/+12
2006-06-25rebase: cleanup rebasing with --mergeEric Wong1-28/+5
2006-06-25rebase: allow --merge option to handle patches merged upstreamEric Wong1-4/+11
2006-06-22rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano1-13/+10
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeEric Wong1-0/+9
2006-06-21rebase: Allow merge strategies to be used when rebasingEric Wong1-9/+183
2006-05-21git-rebase: use canonical A..B syntax to format-patchJunio C Hamano1-1/+1
2006-05-14Make git rebase interactive help match documentation.Sean1-5/+16
2006-04-26Add --continue and --abort options to git-rebase.sean1-20/+34
2006-04-26rebase: typofix.Junio C Hamano1-1/+1
2006-04-13Shell utilities: Guard against expr' magic tokens.Mark Wooding1-1/+1
2006-02-21Fix typo in git-rebase.sh.Jason Riedy1-1/+1
2006-02-21git-rebase: Clarify usage statement and copy it into the actual documentation.Carl Worth1-10/+14
2006-02-18Merge branch 'jc/rebase-limit'Junio C Hamano1-18/+71
2006-02-14rebase: allow rebasing onto different base.Junio C Hamano1-18/+71
generated by cgit (git 2.54.0.dirty) at 2026-09-15 12:02:14 +0000