aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2011-01-27
|\
| * rebase: give a better error message for bogus branchJeff King2011-01-26
| * rebase: use explicit "--" with checkoutJeff King2011-01-26
| * Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-14
| |\
| * \ Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-14
| |\ \
* | \ \ Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-12
|\ \ \ \
| * | | | rebase: support --verifyMartin von Zweigbergk2010-11-23
| |/ / /
* | | | Merge branch 'mz/rebase-abort-reflog-fix'Junio C Hamano2010-12-12
|\ \ \ \ | | |_|/ | |/| |
| * | | rebase --abort: do not update branch refMartin von Zweigbergk2010-11-23
| |/ /
* | | Merge branch 'mz/maint-rebase-stat-config'Junio C Hamano2010-12-12
|\ \ \ | | |/ | |/|
| * | rebase: only show stat if configured to trueMartin von Zweigbergk2010-11-29
* | | Merge branch 'rr/needs-clean-work-tree'Junio C Hamano2010-11-29
|\ \ \ | |_|/ |/| |
| * | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-28
* | | rebase -X: do not clobber strategyMartin von Zweigbergk2010-11-10
|/ /
* | shell portability: no "export VAR=VAL"Junio C Hamano2010-10-13
* | Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano2010-09-15
|\ \
| * | Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon2010-09-09
| * | Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-20
| |\ \
* | \ \ Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-18
|\ \ \ \
| * | | | rebase: support -X to pass through strategy optionsMike Lundy2010-08-03
* | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-18
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | rebase: protect against diff.renames configurationJunio C Hamano2010-07-23
| |/ /
* | | git-rebase: fix typo when parsing --force-rebaseWilly Tarreau2010-08-09
* | | Fix git rebase --continue to work with touched filesDavid D. Kilzer2010-07-28
|/ /
* | rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-31
* | Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-03
|\ \
| * | Teach rebase the --no-ff option.Marc Branchaud2010-03-24
| |/
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ | |/ |/|
| * rebase: support automatic notes copyingThomas Rast2010-03-12
| * rebase: invoke post-rewrite hookThomas Rast2010-03-12
* | rebase: don't invoke the pager for each commit summaryMarkus Heidelberg2010-01-30
* | rebase: replace antiquated sed invocationStephen Boyd2010-01-25
|/
* Merge branch 'jc/rerere'Junio C Hamano2010-01-18
|\
| * Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-13
|\ \ | |/ |/|
| * rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-07
| * "rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano2009-11-21
* | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\ \
| * | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| |/
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
|/
* rebase: use plumbing to show dirty stateJeff King2009-09-11
* Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-21
|\
| * git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-05
* | rebase: consistent error messages for staged and unstaged changes.Matthieu Moy2009-08-06
|/
* Merge branch 'sb/quiet-porcelains'Junio C Hamano2009-07-01
|\
| * am, rebase: teach quiet optionStephen Boyd2009-06-18
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-14
|/
* rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio2009-03-27
* rebase: add options passed to git-amMichele Ballabio2009-03-18
* Merge branch 'tv/rebase-stat'Junio C Hamano2009-03-11
|\