summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
2019-01-29Merge branch 'os/rebase-runs-post-checkout-hook'Junio C Hamano
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2019-01-02rebase: run post-checkout hook on checkoutOrgad Shaneh
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin
2018-12-01Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano
2018-12-01Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano
2018-12-01builtin/rebase.c: remove superfluous space in messagesRalf Thielow
2018-11-30rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin
2018-11-30rebase: fix GIT_REFLOG_ACTION regressionJohannes Schindelin
2018-11-21Merge branch 'js/builtin-rebase-perf-fix-err-fix'Junio C Hamano
2018-11-21rebase: warn about the correct tree's OIDJohannes Schindelin
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Junio C Hamano
2018-11-18Merge branch 'js/rebase-am-options'Junio C Hamano
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Junio C Hamano
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Junio C Hamano
2018-11-16tests: add a special setup where rebase.useBuiltin is offÆvar Arnfjörð Bjarmason
2018-11-16rebase: validate -C<n> and --whitespace=<mode> parameters earlyJohannes Schindelin
2018-11-16rebase: really just passthru the `git am` optionsJohannes Schindelin
2018-11-13built-in rebase: reinstate `checkout -q` behavior where appropriateJohannes Schindelin
2018-11-13rebase: prepare reset_head() for more flagsJohannes Schindelin
2018-11-13rebase: consolidate clean-up code before leaving reset_head()Johannes Schindelin
2018-11-13built-in rebase --skip/--abort: clean up stale .git/<name> filesJohannes Schindelin
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleJohannes Schindelin
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King
2018-11-02rebase: apply cocci patchJunio C Hamano
2018-11-02Merge branch 'js/rebase-autostash-fix'Junio C Hamano
2018-11-02Merge branch 'jc/rebase-in-c-5-test-typofix'Junio C Hamano
2018-11-02Merge branch 'pk/rebase-in-c-6-final'Junio C Hamano
2018-11-02Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'Junio C Hamano
2018-11-02Merge branch 'pk/rebase-in-c-5-test'Junio C Hamano
2018-11-02Merge branch 'pk/rebase-in-c-4-opts'Junio C Hamano
2018-11-02Merge branch 'pk/rebase-in-c-3-acts'Junio C Hamano
2018-11-02Merge branch 'pk/rebase-in-c-2-basic'Junio C Hamano
2018-10-24rebase --autostash: fix issue with dirty submodulesJohannes Schindelin
2018-10-23rebase (autostash): use an explicit OID to apply the stashJohannes Schindelin
2018-10-23rebase (autostash): store the full OID in <state-dir>/autostashJohannes Schindelin
2018-10-23rebase (autostash): avoid duplicate call to state_dir_path()Johannes Schindelin
2018-10-11rebase: fix typoes in error messagesJunio C Hamano
2018-10-11rebase: default to using the builtin rebasePratik Karki
2018-10-11builtin rebase: prepare for builtin rebase -iJohannes Schindelin
2018-10-11builtin rebase: error out on incompatible option/mode combinationsPratik Karki
2018-10-11builtin rebase: use no-op editor when interactive is "implied"Pratik Karki
2018-10-11builtin rebase: show progress when connected to a terminalPratik Karki