summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* Fixing path quoting in git-rebaseJonathan del Strother2007-10-181-13/+13
* Merge branch 'maint'Junio C Hamano2007-09-231-3/+2
|\
| * Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-3/+2
* | git-rebase: fix -C optionJ. Bruce Fields2007-09-071-1/+0
* | git-rebase: support --whitespace=<option>J. Bruce Fields2007-09-071-1/+4
|/
* Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano2007-09-011-4/+1
* rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt2007-09-011-5/+8
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-9/+3
* Allow rebase to run if upstream is completely mergedJohannes Sixt2007-07-041-3/+5
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-19/+19
* Teach rebase an interactive modeJohannes Schindelin2007-06-241-1/+11
* git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca2007-06-021-2/+2
* Add colour support in rebase and merge tree diff stats output.James Bowes2007-05-101-1/+2
* Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-131-2/+1
* Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen2007-03-241-6/+4
* git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano2007-03-221-4/+4
* add -C[NUM] to git-amMichael S. Tsirkin2007-02-081-1/+6
* Improved error message from git-rebaseDavid Kågedal2007-01-311-1/+2
* git-rebase: allow rebasing a detached HEAD.Junio C Hamano2007-01-201-2/+6
* Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-121-0/+3
* Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-101-0/+1
* Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce2006-12-281-1/+10
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-6/+4
* merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-221-0/+1
* rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-091-0/+8
* remove merge-recursive-oldJunio C Hamano2006-11-211-9/+0
* git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman2006-10-041-1/+11
* git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman2006-10-041-1/+1
* Deprecate merge-recursive.pyJunio C Hamano2006-09-241-15/+4
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-121-9/+6
|\
| * rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman2006-07-311-1/+1
| * rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman2006-07-311-8/+5
* | Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-301-3/+6
|\ \ | |/
| * Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-131-3/+6
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-131-2/+13
* | Status update on merge-recursive in CJohannes Schindelin2006-07-131-2/+2
|/
* Using 'perl' in *.shMichal Rokos2006-07-081-1/+1
* rebase: check for errors from git-commitEric Wong2006-06-281-1/+6
* rebase: get rid of outdated MRESOLVEMSGEric Wong2006-06-281-8/+3
* Fix expr usage for FreeBSDDennis Stosberg2006-06-271-1/+1
* rebase: allow --skip to work with --mergeEric Wong2006-06-251-1/+12
* rebase: cleanup rebasing with --mergeEric Wong2006-06-251-28/+5
* rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-251-4/+11
* rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano2006-06-221-13/+10
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-211-0/+9
* rebase: Allow merge strategies to be used when rebasingEric Wong2006-06-211-9/+183
* git-rebase: use canonical A..B syntax to format-patchJunio C Hamano2006-05-211-1/+1
* Make git rebase interactive help match documentation.Sean2006-05-141-5/+16
* Add --continue and --abort options to git-rebase.sean2006-04-261-24/+38
View Lorry Controller Status