path: root/
AgeCommit message (Expand)Author
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman
2006-10-04git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman
2006-09-25Deprecate merge-recursive.pyJunio C Hamano
2006-08-13Merge branch 'master' into js/c-merge-recursiveJunio C Hamano
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman
2006-07-31Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano
2006-07-14recur vs recursive: help testing without touching too many stuff.Junio C Hamano
2006-07-14Status update on merge-recursive in CJohannes Schindelin
2006-07-14Record rebase changes as 'rebase' in the reflog.Shawn Pearce
2006-07-08Using 'perl' in *.shMichal Rokos
2006-06-28rebase: check for errors from git-commitEric Wong
2006-06-28rebase: get rid of outdated MRESOLVEMSGEric Wong
2006-06-27Fix expr usage for FreeBSDDennis Stosberg
2006-06-25rebase: allow --skip to work with --mergeEric Wong
2006-06-25rebase: cleanup rebasing with --mergeEric Wong
2006-06-25rebase: allow --merge option to handle patches merged upstreamEric Wong
2006-06-22rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeEric Wong
2006-06-21rebase: Allow merge strategies to be used when rebasingEric Wong
2006-05-21git-rebase: use canonical A..B syntax to format-patchJunio C Hamano
2006-05-14Make git rebase interactive help match documentation.Sean
2006-04-27Add --continue and --abort options to git-rebase.sean
2006-04-26rebase: typofix.Junio C Hamano
2006-04-13Shell utilities: Guard against expr' magic tokens.Mark Wooding
2006-02-22Fix typo in Riedy
2006-02-22git-rebase: Clarify usage statement and copy it into the actual documentation.Carl Worth
2006-02-18Merge branch 'jc/rebase-limit'Junio C Hamano
2006-02-15rebase: allow rebasing onto different base.Junio C Hamano
2006-02-13rebase: allow a hook to refuse rebasing.Junio C Hamano
2005-12-15Bugfixes for git-rebaseLukas Sandström
2005-12-14rebase: do not get confused in fast-forward situation.Junio C Hamano
2005-12-14git-rebase: Usage string clean-up, emit usage string at incorrect
2005-11-28rebase: one safety net, one bugfix and one optimization.Junio C Hamano
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
2005-11-18Rewrite rebase to use git-format-patch piped to git-am.Junio C Hamano
2005-09-28Use git-update-ref in scripts.Junio C Hamano
2005-09-08Big tool rename.Junio C Hamano