index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
rebase.c
Age
Commit message (
Expand
)
Author
Files
Lines
2022-02-18
Merge branch 'pw/use-in-process-checkout-in-rebase'
Junio C Hamano
1
-41
/
+60
2022-02-09
Merge branch 'ab/config-based-hooks-2'
Junio C Hamano
1
-1
/
+2
2022-01-26
rebase --apply: set ORIG_HEAD correctly
Phillip Wood
1
-0
/
+1
2022-01-26
rebase --apply: fix reflog
Phillip Wood
1
-4
/
+4
2022-01-26
reset_head(): take struct rebase_head_opts
Phillip Wood
1
-21
/
+36
2022-01-26
rebase: cleanup reset_head() calls
Phillip Wood
1
-2
/
+2
2022-01-26
create_autostash(): remove unneeded parameter
Phillip Wood
1
-4
/
+4
2022-01-26
reset_head(): make default_reflog_action optional
Phillip Wood
1
-6
/
+4
2022-01-26
reset_head(): remove action parameter
Phillip Wood
1
-7
/
+7
2022-01-26
rebase: factor out checkout for up to date branch
Phillip Wood
1
-14
/
+19
2022-01-07
rebase: convert pre-rebase to use hook.h
Emily Shaffer
1
-1
/
+2
2022-01-05
i18n: turn even more messages into "cannot be used together" ones
Jean-Noël Avila
1
-2
/
+2
2022-01-05
i18n: turn "options are incompatible" into "cannot be used together"
Jean-Noël Avila
1
-3
/
+3
2021-10-18
Merge branch 'js/retire-preserve-merges'
Junio C Hamano
1
-324
/
+14
2021-10-06
Merge branch 'pw/rebase-of-a-tag-fix'
Junio C Hamano
1
-28
/
+21
2021-09-22
rebase: dereference tags
Phillip Wood
1
-6
/
+8
2021-09-22
rebase: use lookup_commit_reference_by_name()
Phillip Wood
1
-13
/
+4
2021-09-22
rebase: use our standard error return value
Phillip Wood
1
-9
/
+9
2021-09-20
Merge branch 'js/run-command-close-packs'
Junio C Hamano
1
-1
/
+0
2021-09-20
Merge branch 'ds/mergies-with-sparse-index'
Junio C Hamano
1
-0
/
+6
2021-09-10
Merge branch 'js/advise-when-skipping-cherry-picked'
Junio C Hamano
1
-0
/
+1
2021-09-09
sparse-index: integrate with cherry-pick and rebase
Derrick Stolee
1
-0
/
+6
2021-09-09
run_auto_maintenance(): implicitly close the object store
Johannes Schindelin
1
-1
/
+0
2021-09-08
Merge branch 'ab/rebase-fatal-fatal-fix'
Junio C Hamano
1
-1
/
+1
2021-09-07
rebase: stop mentioning the -p option in comments
Johannes Schindelin
1
-1
/
+1
2021-09-07
rebase: remove obsolete code comment
Johannes Schindelin
1
-1
/
+1
2021-09-07
rebase: drop the internal `rebase--interactive` command
Johannes Schindelin
1
-192
/
+1
2021-09-07
rebase: drop support for `--preserve-merges`
Johannes Schindelin
1
-127
/
+11
2021-08-30
sequencer: advise if skipping cherry-picked commit
Josh Steadmon
1
-0
/
+1
2021-08-30
Merge branch 'en/ort-becomes-the-default'
Junio C Hamano
1
-1
/
+1
2021-08-24
rebase: emit one "fatal" in "fatal: fatal: <error>"
Ævar Arnfjörð Bjarmason
1
-1
/
+1
2021-08-05
Change default merge backend from recursive to ort
Elijah Newren
1
-1
/
+1
2021-07-26
builtin/rebase: fix options.strategy memory lifecycle
Andrzej Hunt
1
-1
/
+2
2021-05-10
Merge branch 'bc/hash-transition-interop-part-1'
Junio C Hamano
1
-2
/
+2
2021-05-07
Merge branch 'ah/plugleaks'
Junio C Hamano
1
-0
/
+1
2021-04-28
builtin/rebase: release git_format_patch_opt too
Andrzej Hunt
1
-0
/
+1
2021-04-27
hash: provide per-algorithm null OIDs
brian m. carlson
1
-2
/
+2
2021-04-16
Merge branch 'en/ort-readiness'
Junio C Hamano
1
-0
/
+1
2021-03-23
rebase: remove transitory rebase.useBuiltin setting & env
Ævar Arnfjörð Bjarmason
1
-11
/
+0
2021-03-20
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
Elijah Newren
1
-0
/
+1
2021-02-24
rebase: add a config option for --no-fork-point
Alex Henrie
1
-7
/
+13
2021-01-15
Merge branch 'rs/rebase-commit-validation'
Junio C Hamano
1
-1
/
+3
2021-01-04
rebase: verify commit parameter
René Scharfe
1
-1
/
+3
2020-11-18
Merge branch 'en/merge-ort-api-null-impl'
Junio C Hamano
1
-1
/
+12
2020-11-18
Merge branch 'pw/rebase-i-orig-head'
Junio C Hamano
1
-10
/
+10
2020-11-04
rebase -i: simplify get_revision_ranges()
Phillip Wood
1
-6
/
+4
2020-11-04
rebase -i: use struct object_id when writing state
Phillip Wood
1
-2
/
+3
2020-11-04
rebase -i: use struct object_id rather than looking up commit
Phillip Wood
1
-2
/
+3
2020-11-04
rebase -i: stop overwriting ORIG_HEAD buffer
Phillip Wood
1
-5
/
+5
2020-11-02
merge,rebase,revert: select ort or recursive by config or environment
Elijah Newren
1
-1
/
+12
[next]