diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-17 13:17:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 11:53:03 -0700 |
| commit | a77060218dfae5e8209a0ee131f292b881ce533b (patch) | |
| tree | 464395228011d795e74cd8cd241b7563d7ac96b4 /git-merge-resolve.sh | |
| parent | rebase: store orig_head as a commit (diff) | |
| download | git-a77060218dfae5e8209a0ee131f292b881ce533b.tar.gz git-a77060218dfae5e8209a0ee131f292b881ce533b.zip | |
rebase: rename merge_base to branch_base
merge_base is not a very descriptive name, the variable always holds
the merge-base of 'branch' and 'onto' which is commit at the base of
the branch being rebased so rename it to branch_base.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions