Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gc: config option for running --auto in background
[gitweb.git]
/
git-rebase--merge.sh
diff --git
a/git-rebase--merge.sh
b/git-rebase--merge.sh
index 16d18176ece5eecf4a3b0b0a9dea0a5b41ac43d4..e7d96de9adcb133982bbbc6d20cd3b52b3c89214 100644
(file)
--- 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.
#