aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
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-24/+38
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
2006-02-13rebase: allow a hook to refuse rebasing.Junio C Hamano1-0/+9
2005-12-14Bugfixes for git-rebaseLukas Sandström1-11/+18
2005-12-14rebase: do not get confused in fast-forward situation.Junio C Hamano1-0/+3
2005-12-14git-rebase: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se1-2/+3
2005-11-28rebase: one safety net, one bugfix and one optimization.Junio C Hamano1-1/+27
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano1-1/+1
2005-11-18Rewrite rebase to use git-format-patch piped to git-am.Junio C Hamano1-56/+16
2005-09-28Use git-update-ref in scripts.Junio C Hamano1-2/+3
2005-09-07Big tool rename.Junio C Hamano1-0/+68
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 23:55:53 +0000