summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:50 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:09 -0800
commit431b7e7818fe3d118e4bf9e40ba6807ed2c511be (patch)
treeda3093e1dd3941c65c413540a8563a364e4c121d /git-rebase--merge.sh
parent89c7ae9c3bffe599b46a18a9a504fd3e28a9e715 (diff)
downloadgit-431b7e7818fe3d118e4bf9e40ba6807ed2c511be.tar.gz
rebase -i: align variable names
Rename variables HEAD and OLDHEAD to orig_head and HEADNAME to head_name, which are the names used in git-rebase.sh. This prepares for factoring out of the code that persists these variables during the entire rebase process. Using the same variable names to mean the same thing in both files also makes the code easier to read. While at it, also remove the DOTEST variable and use the state_dir variable that was inherited from git-rebase.sh instead. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions