projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-am, applymbox replacement.
[git.git]
/
templates
/
hooks--update
diff --git
a/templates/hooks--update
b/templates/hooks--update
index
0726975
..
3f38b82
100644
(file)
--- a/
templates/hooks--update
+++ b/
templates/hooks--update
@@
-16,10
+16,14
@@
then
git-rev-list --pretty "$3"
else
$base=$(git-merge-base "$2" "$3")
git-rev-list --pretty "$3"
else
$base=$(git-merge-base "$2" "$3")
- if [ $base == "$2" ]; then
+ case "$base" in
+ "$2")
echo "New commits:"
echo "New commits:"
- else
+ ;;
+ *)
echo "Rebased ref, commits from common ancestor:"
echo "Rebased ref, commits from common ancestor:"
+ ;;
+ esac
fi
git-rev-list --pretty "$3" "^$base"
fi |
fi
git-rev-list --pretty "$3" "^$base"
fi |