summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2018-11-02rebase: apply cocci patchLibravatar Junio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-autostash-fix'Libravatar Junio C Hamano1-3/+5
2018-11-02Merge branch 'jc/rebase-in-c-5-test-typofix'Libravatar Junio C Hamano1-3/+3
2018-11-02Merge branch 'pk/rebase-in-c-6-final'Libravatar Junio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'Libravatar Junio C Hamano1-4/+83
2018-11-02Merge branch 'pk/rebase-in-c-5-test'Libravatar Junio C Hamano1-15/+135
2018-11-02Merge branch 'pk/rebase-in-c-4-opts'Libravatar Junio C Hamano1-10/+440
2018-11-02Merge branch 'pk/rebase-in-c-3-acts'Libravatar Junio C Hamano1-4/+189
2018-11-02Merge branch 'pk/rebase-in-c-2-basic'Libravatar Junio C Hamano1-13/+321
2018-10-24rebase --autostash: fix issue with dirty submodulesLibravatar Johannes Schindelin1-1/+1
2018-10-23rebase (autostash): use an explicit OID to apply the stashLibravatar Johannes Schindelin1-0/+2
2018-10-23rebase (autostash): store the full OID in <state-dir>/autostashLibravatar Johannes Schindelin1-1/+1
2018-10-23rebase (autostash): avoid duplicate call to state_dir_path()Libravatar Johannes Schindelin1-1/+1
2018-10-11rebase: fix typoes in error messagesLibravatar Junio C Hamano1-3/+3
2018-10-11rebase: default to using the builtin rebaseLibravatar Pratik Karki1-1/+1
2018-10-11builtin rebase: prepare for builtin rebase -iLibravatar Johannes Schindelin1-4/+83
2018-10-11builtin rebase: error out on incompatible option/mode combinationsLibravatar Pratik Karki1-0/+41
2018-10-11builtin rebase: use no-op editor when interactive is "implied"Libravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: show progress when connected to a terminalLibravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: fast-forward to onto if it is a proper descendantLibravatar Pratik Karki1-0/+18
2018-10-11builtin rebase: optionally pass custom reflogs to reset_head()Libravatar Pratik Karki1-12/+21
2018-10-11builtin rebase: optionally auto-detect the upstreamLibravatar Pratik Karki1-3/+41
2018-10-11builtin rebase: support --rootLibravatar Pratik Karki1-2/+29
2018-10-11builtin rebase: add support for custom merge strategiesLibravatar Pratik Karki1-0/+57
2018-10-11builtin rebase: support `fork-point` optionLibravatar Pratik Karki1-0/+11
2018-10-11builtin rebase: support --rebase-merges[=[no-]rebase-cousins]Libravatar Pratik Karki1-0/+21
2018-10-11builtin rebase: support `--allow-empty-message` optionLibravatar Pratik Karki1-0/+7
2018-10-11builtin rebase: support `--exec`Libravatar Pratik Karki1-0/+18
2018-10-11builtin rebase: support `--autostash` optionLibravatar Pratik Karki1-8/+109
2018-10-11builtin rebase: support `-C` and `--whitespace=<type>`Libravatar Pratik Karki1-0/+23
2018-10-11builtin rebase: support `--gpg-sign` optionLibravatar Pratik Karki1-0/+28
2018-09-06builtin rebase: support `--autosquash`Libravatar Pratik Karki1-0/+10
2018-09-06builtin rebase: support `keep-empty` optionLibravatar Pratik Karki1-0/+24
2018-09-06builtin rebase: support `ignore-date` optionLibravatar Pratik Karki1-0/+8
2018-09-06builtin rebase: support `ignore-whitespace` optionLibravatar Pratik Karki1-0/+6
2018-09-06builtin rebase: support --committer-date-is-author-dateLibravatar Pratik Karki1-0/+10
2018-09-06builtin rebase: support --rerere-autoupdateLibravatar Pratik Karki1-0/+25
2018-09-06builtin rebase: support --signoffLibravatar Pratik Karki1-0/+17
2018-09-06builtin rebase: allow selecting the rebase "backend"Libravatar Pratik Karki1-0/+37
2018-09-06builtin rebase: stop if `git am` is in progressLibravatar Pratik Karki1-0/+5
2018-09-06builtin rebase: actions require a rebase in progressLibravatar Pratik Karki1-0/+3
2018-09-06builtin rebase: support --edit-todo and --show-current-patchLibravatar Pratik Karki1-1/+22
2018-09-06builtin rebase: support --quitLibravatar Pratik Karki1-0/+11
2018-09-06builtin rebase: support --abortLibravatar Pratik Karki1-0/+20
2018-09-06builtin rebase: support --skipLibravatar Pratik Karki1-0/+18
2018-09-06builtin rebase: support --continueLibravatar Pratik Karki1-4/+111
2018-09-06builtin rebase: support `git rebase <upstream> <switch-to>`Libravatar Pratik Karki1-4/+44
2018-09-06builtin rebase: only store fully-qualified refs in `options.head_name`Libravatar Pratik Karki1-3/+8
2018-09-06builtin rebase: start a new rebase only if none is in progressLibravatar Pratik Karki1-1/+47
2018-09-06builtin rebase: support --force-rebaseLibravatar Pratik Karki1-1/+21
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 21:55:42 +0000