| Commit message (Expand) | Author | Age | Files | Lines |
* | git-rebase: suggest to use git-add instead of git-update-index | Jonas Fonseca | 2007-06-02 | 1 | -2/+2 |
* | Add colour support in rebase and merge tree diff stats output. | James Bowes | 2007-05-10 | 1 | -1/+2 |
* | Use rev-list --reverse in git-rebase.sh | Alex Riesen | 2007-04-13 | 1 | -2/+1 |
* | Use diff* with --exit-code in git-am, git-rebase and git-merge-ours | Alex Riesen | 2007-03-24 | 1 | -6/+4 |
* | git-rebase: make 'rebase HEAD branch' work as expected. | Junio C Hamano | 2007-03-22 | 1 | -4/+4 |
* | add -C[NUM] to git-am | Michael S. Tsirkin | 2007-02-08 | 1 | -1/+6 |
* | Improved error message from git-rebase | David Kågedal | 2007-01-31 | 1 | -1/+2 |
* | git-rebase: allow rebasing a detached HEAD. | Junio C Hamano | 2007-01-20 | 1 | -2/+6 |
* | Allow whole-tree operations to be started from a subdirectory | Junio C Hamano | 2007-01-12 | 1 | -0/+3 |
* | Disallow working directory commands in a bare repository. | Shawn O. Pearce | 2007-01-10 | 1 | -0/+1 |
* | Use branch names in 'git-rebase -m' conflict hunks. | Shawn O. Pearce | 2006-12-28 | 1 | -1/+10 |
* | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 2006-12-28 | 1 | -6/+4 |
* | merge and reset: adjust for "reset --hard" messages | Junio C Hamano | 2006-12-22 | 1 | -0/+1 |
* | rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am | Eric Wong | 2006-12-09 | 1 | -0/+8 |
* | remove merge-recursive-old | Junio C Hamano | 2006-11-21 | 1 | -9/+0 |
* | git-rebase: Add a -v option to show a diffstat of the changes upstream at the... | Robert Shearman | 2006-10-04 | 1 | -1/+11 |
* | git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. | Robert Shearman | 2006-10-04 | 1 | -1/+1 |
* | Deprecate merge-recursive.py | Junio C Hamano | 2006-09-24 | 1 | -15/+4 |
* | Merge branch 'master' into js/c-merge-recursive | Junio C Hamano | 2006-08-12 | 1 | -9/+6 |
|\ |
|
| * | rebase: Make the fast-fowarding message more user-friendly by using branch na... | Robert Shearman | 2006-07-31 | 1 | -1/+1 |
| * | rebase: Fix the detection of fast-forwarding of the current branch to upstream. | Robert Shearman | 2006-07-31 | 1 | -8/+5 |
* | | Merge branch 'js/read-tree' into js/c-merge-recursive | Junio C Hamano | 2006-07-30 | 1 | -3/+6 |
|\ \
| |/ |
|
| * | Record rebase changes as 'rebase' in the reflog. | Shawn Pearce | 2006-07-13 | 1 | -3/+6 |
* | | recur vs recursive: help testing without touching too many stuff. | Junio C Hamano | 2006-07-13 | 1 | -2/+13 |
* | | Status update on merge-recursive in C | Johannes Schindelin | 2006-07-13 | 1 | -2/+2 |
|/ |
|
* | Using 'perl' in *.sh | Michal Rokos | 2006-07-08 | 1 | -1/+1 |
* | rebase: check for errors from git-commit | Eric Wong | 2006-06-28 | 1 | -1/+6 |
* | rebase: get rid of outdated MRESOLVEMSG | Eric Wong | 2006-06-28 | 1 | -8/+3 |
* | Fix expr usage for FreeBSD | Dennis Stosberg | 2006-06-27 | 1 | -1/+1 |
* | rebase: allow --skip to work with --merge | Eric Wong | 2006-06-25 | 1 | -1/+12 |
* | rebase: cleanup rebasing with --merge | Eric Wong | 2006-06-25 | 1 | -28/+5 |
* | rebase: allow --merge option to handle patches merged upstream | Eric Wong | 2006-06-25 | 1 | -4/+11 |
* | rebase --merge: fix for rebasing more than 7 commits. | Junio C Hamano | 2006-06-22 | 1 | -13/+10 |
* | rebase: error out for NO_PYTHON if they use recursive merge | Eric Wong | 2006-06-21 | 1 | -0/+9 |
* | rebase: Allow merge strategies to be used when rebasing | Eric Wong | 2006-06-21 | 1 | -9/+183 |
* | git-rebase: use canonical A..B syntax to format-patch | Junio C Hamano | 2006-05-21 | 1 | -1/+1 |
* | Make git rebase interactive help match documentation. | Sean | 2006-05-14 | 1 | -5/+16 |
* | Add --continue and --abort options to git-rebase. | sean | 2006-04-26 | 1 | -24/+38 |
* | rebase: typofix. | Junio C Hamano | 2006-04-26 | 1 | -1/+1 |
* | Shell utilities: Guard against expr' magic tokens. | Mark Wooding | 2006-04-13 | 1 | -1/+1 |
* | Fix typo in git-rebase.sh. | Jason Riedy | 2006-02-21 | 1 | -1/+1 |
* | git-rebase: Clarify usage statement and copy it into the actual documentation. | Carl Worth | 2006-02-21 | 1 | -10/+14 |
* | Merge branch 'jc/rebase-limit' | Junio C Hamano | 2006-02-18 | 1 | -18/+71 |
|\ |
|
| * | rebase: allow rebasing onto different base. | Junio C Hamano | 2006-02-14 | 1 | -18/+71 |
* | | rebase: allow a hook to refuse rebasing. | Junio C Hamano | 2006-02-13 | 1 | -0/+9 |
|/ |
|
* | Bugfixes for git-rebase | Lukas Sandström | 2005-12-14 | 1 | -11/+18 |
* | rebase: do not get confused in fast-forward situation. | Junio C Hamano | 2005-12-14 | 1 | -0/+3 |
* | git-rebase: Usage string clean-up, emit usage string at incorrect invocation | freku045@student.liu.se | 2005-12-14 | 1 | -2/+3 |
* | rebase: one safety net, one bugfix and one optimization. | Junio C Hamano | 2005-11-28 | 1 | -1/+27 |
* | git-sh-setup: die if outside git repository. | Junio C Hamano | 2005-11-25 | 1 | -1/+1 |