summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
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
2018-10-11builtin rebase: fast-forward to onto if it is a proper descendantPratik Karki
2018-10-11builtin rebase: optionally pass custom reflogs to reset_head()Pratik Karki
2018-10-11builtin rebase: optionally auto-detect the upstreamPratik Karki
2018-10-11builtin rebase: support --rootPratik Karki
2018-10-11builtin rebase: add support for custom merge strategiesPratik Karki
2018-10-11builtin rebase: support `fork-point` optionPratik Karki
2018-10-11builtin rebase: support --rebase-merges[=[no-]rebase-cousins]Pratik Karki
2018-10-11builtin rebase: support `--allow-empty-message` optionPratik Karki
2018-10-11builtin rebase: support `--exec`Pratik Karki
2018-10-11builtin rebase: support `--autostash` optionPratik Karki
2018-10-11builtin rebase: support `-C` and `--whitespace=<type>`Pratik Karki
2018-10-11builtin rebase: support `--gpg-sign` optionPratik Karki
2018-09-06builtin rebase: support `--autosquash`Pratik Karki
2018-09-06builtin rebase: support `keep-empty` optionPratik Karki
2018-09-06builtin rebase: support `ignore-date` optionPratik Karki
2018-09-06builtin rebase: support `ignore-whitespace` optionPratik Karki
2018-09-06builtin rebase: support --committer-date-is-author-datePratik Karki
2018-09-06builtin rebase: support --rerere-autoupdatePratik Karki
2018-09-06builtin rebase: support --signoffPratik Karki
2018-09-06builtin rebase: allow selecting the rebase "backend"Pratik Karki
2018-09-06builtin rebase: stop if `git am` is in progressPratik Karki
2018-09-06builtin rebase: actions require a rebase in progressPratik Karki
2018-09-06builtin rebase: support --edit-todo and --show-current-patchPratik Karki
2018-09-06builtin rebase: support --quitPratik Karki
2018-09-06builtin rebase: support --abortPratik Karki
2018-09-06builtin rebase: support --skipPratik Karki
2018-09-06builtin rebase: support --continuePratik Karki
2018-09-06builtin rebase: support `git rebase <upstream> <switch-to>`Pratik Karki
2018-09-06builtin rebase: only store fully-qualified refs in `options.head_name`Pratik Karki
2018-09-06builtin rebase: start a new rebase only if none is in progressPratik Karki
2018-09-06builtin rebase: support --force-rebasePratik Karki