summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
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
2005-12-14git-rebase: Usage string clean-up, emit usage string at incorrect invocationLibravatar freku045@student.liu.se1-2/+3
2005-11-28rebase: one safety net, one bugfix and one optimization.Libravatar Junio C Hamano1-1/+27
2005-11-25git-sh-setup: die if outside git repository.Libravatar Junio C Hamano1-1/+1
2005-11-18Rewrite rebase to use git-format-patch piped to git-am.Libravatar Junio C Hamano1-56/+16
2005-09-28Use git-update-ref in scripts.Libravatar Junio C Hamano1-2/+3
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+68