diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-17 12:54:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 12:54:27 -0700 |
| commit | a524c627a424171c9cc2be2258725adc3f0bcc5a (patch) | |
| tree | 9699e6c34eb24a9b2d9981c303b4b8e2a89ba489 /git-gui/lib/diff.tcl | |
| parent | a0feb8611d4c0b2b5d954efe4e98207f62223436 (diff) | |
| parent | aa1df8146d70bb85c63b0999868fe29aebc1173e (diff) | |
Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
* pw/rebase-keep-base-fixes:
rebase --keep-base: imply --no-fork-point
rebase --keep-base: imply --reapply-cherry-picks
rebase: factor out branch_base calculation
rebase: rename merge_base to branch_base
rebase: store orig_head as a commit
rebase: be stricter when reading state files containing oids
t3416: set $EDITOR in subshell
t3416: tighten two tests
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions