diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-29 20:37:28 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-29 20:37:28 +0000 |
| commit | e98c205a5c3fb893ffdda3f5e05d1967b4a79c1d (patch) | |
| tree | 3ecbd4f05ab9601cefa7b322323039795db440a9 /git-rebase--merge.sh | |
| parent | 43efcf42382e87de4aa423e5e1607958ad1717d0 (diff) | |
| parent | 0bc85abb7aa9b24b093253018801a0fb43d01122 (diff) | |
| download | git-baserock/ps/update-git.tar.gz | |
Merge tag 'v1.9.2' into HEADbaserock/ps/update-git
Git 1.9.2
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. # |