summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:41 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-10 14:08:08 -0800
commit8f9bfb64c5d5179cc7439715379077875248c4ab (patch)
treefa6d7ffeae5eb6340f764b778d8b928715ad3758 /Documentation/git-merge.txt
parentrebase -i: remove now unnecessary directory checks (diff)
downloadtgif-8f9bfb64c5d5179cc7439715379077875248c4ab.tar.xz
rebase: reorder validation steps
Reorder validation steps in preparation for the validation to be factored out from git-rebase--interactive.sh into git-rebase.sh. The main functional difference is that the pre-rebase hook will no longer be run if the work tree is dirty. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions