summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2018-12-11rebase: introduce --reschedule-failed-execLibravatar Johannes Schindelin1-1/+15
2018-12-01Merge branch 'rt/rebase-in-c-message-fix'Libravatar Junio C Hamano1-2/+2
2018-12-01Merge branch 'js/rebase-stat-unrelated-fix'Libravatar Junio C Hamano1-6/+12
2018-12-01builtin/rebase.c: remove superfluous space in messagesLibravatar Ralf Thielow1-2/+2
2018-11-30rebase --stat: fix when rebasing to an unrelated historyLibravatar Johannes Schindelin1-6/+12
2018-11-30rebase: fix GIT_REFLOG_ACTION regressionLibravatar Johannes Schindelin1-3/+26
2018-11-21Merge branch 'js/builtin-rebase-perf-fix-err-fix'Libravatar Junio C Hamano1-1/+2
2018-11-21rebase: warn about the correct tree's OIDLibravatar Johannes Schindelin1-1/+2
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Libravatar Junio C Hamano1-1/+4
2018-11-18Merge branch 'js/rebase-am-options'Libravatar Junio C Hamano1-63/+45
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Libravatar Junio C Hamano1-0/+3
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Libravatar Junio C Hamano1-33/+46
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Libravatar Junio C Hamano1-1/+2
2018-11-16tests: add a special setup where rebase.useBuiltin is offLibravatar Ævar Arnfjörð Bjarmason1-1/+4
2018-11-16rebase: validate -C<n> and --whitespace=<mode> parameters earlyLibravatar Johannes Schindelin1-1/+11
2018-11-16rebase: really just passthru the `git am` optionsLibravatar Johannes Schindelin1-63/+35
2018-11-13built-in rebase: reinstate `checkout -q` behavior where appropriateLibravatar Johannes Schindelin1-15/+25
2018-11-13rebase: prepare reset_head() for more flagsLibravatar Johannes Schindelin1-3/+6
2018-11-13rebase: consolidate clean-up code before leaving reset_head()Libravatar Johannes Schindelin1-18/+18
2018-11-13built-in rebase --skip/--abort: clean up stale .git/<name> filesLibravatar Johannes Schindelin1-0/+3
2018-11-12rerere.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-11-12cache-tree.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12wt-status.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleLibravatar Johannes Schindelin1-1/+2
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King1-0/+6
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 03:56:57 +0000