diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
| commit | 694a88a309c74ffeefa9a0db0396ee4c168a521c (patch) | |
| tree | 79007f8bcf98505df2e4cf423ac7307535c1b2d1 /git-rebase--merge.sh | |
| parent | 72911f8c18d06f2ad340061f9a76556b21acf822 (diff) | |
| parent | 11d62145b904b81013d1ad558d68a74e22e81a91 (diff) | |
| download | git-694a88a309c74ffeefa9a0db0396ee4c168a521c.tar.gz | |
Merge branch 'jn/scripts-updates'
* jn/scripts-updates:
remove #!interpreter line from shell libraries
test: replace shebangs with descriptions in shell libraries
test: make FILEMODE a lazy prereq
contrib: remove git-p4import
mark contributed hooks executable
mark perl test scripts executable
mark Windows build scripts executable
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 16d18176ec..e7d96de9ad 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. # |