X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=git-rebase--merge.sh;h=e7d96de9adcb133982bbbc6d20cd3b52b3c89214;hb=65ea9c3c3d0e74b1f8c0c1d9fea6988550133dba;hp=16d18176ece5eecf4a3b0b0a9dea0a5b41ac43d4;hpb=eeb8e8373f68b706f5fc8a00760c3dedf239db70;p=~andy%2Fgit diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 16d18176e..e7d96de9a 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -1,4 +1,6 @@ -#!/bin/sh +# This shell script fragment is sourced by git-rebase to implement +# its merge-based non-interactive mode that copes well with renamed +# files. # # Copyright (c) 2010 Junio C Hamano. #