From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Sun, 6 Feb 2011 18:43:30 +0000 (-0500)
Subject: rebase: clearer names for directory variables
X-Git-Tag: v1.7.10.4~1^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69a636ad1ac73a596d8c99a4206a6475b15e8d8d?ds=inline;hp=69a636ad1ac73a596d8c99a4206a6475b15e8d8d

rebase: clearer names for directory variables

Instead of using the old variable name 'dotest' for
"$GIT_DIR"/rebase-merge and no variable for "$GIT_DIR"/rebase-apply,
introduce two variables 'merge_dir' and 'apply_dir' for these paths.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---