git.droids-corp.org
/
git-central.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cd17251
)
Another comment.
author
Stephen Haberman
<stephen@exigencecorp.com>
Tue, 24 Jun 2008 17:18:16 +0000
(12:18 -0500)
committer
Stephen Haberman
<stephen@exigencecorp.com>
Tue, 24 Jun 2008 17:18:16 +0000
(12:18 -0500)
server/update-prefer-rebase
patch
|
blob
|
history
diff --git
a/server/update-prefer-rebase
b/server/update-prefer-rebase
index
5ae3d84
..
5d9948a
100644
(file)
--- a/
server/update-prefer-rebase
+++ b/
server/update-prefer-rebase
@@
-41,6
+41,7
@@
if expr "$oldrev" : '0*$' >/dev/null ; then
exit 0
fi
+# Read backwards: all commits from old..new, unless they are already referenced by a branch
git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while read commit ; do
number_of_parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | wc -l)
if [[ $number_of_parents > 1 ]] ; then