Documentation: -merge and -pull: describe merge strategies.
[debian-git.git] / git-request-pull.sh
blobae6cd272bab01ba7fa9ac7378fe33e07e853d307
1 #!/bin/sh -e
2 # Copyright 2005, Ryan Anderson <ryan@michonline.com>
4 # This file is licensed under the GPL v2, or a later version
5 # at the discretion of Linus Torvalds.
7 usage()
9 echo "$0 <commit> <url> [ <head> ]"
10 echo " Summarizes the changes since <commit> to the standard output,"
11 echo " and includes <url> in the message generated."
12 exit 1
15 revision=$1
16 url=$2
17 head=${3-HEAD}
19 [ "$revision" ] || usage
20 [ "$url" ] || usage
22 baserev=`git-rev-parse --verify "$revision"^0` &&
23 headrev=`git-rev-parse --verify "$head"^0` || exit
25 echo "The following changes since commit $baserev:"
26 git log --max-count=1 --pretty=short "$baserev" |
27 git-shortlog | sed -e 's/^\(.\)/ \1/'
29 echo "are found in the git repository at:"
30 echo
31 echo " $url"
32 echo
34 git log $baserev..$headrev | git-shortlog ;
35 git diff $baserev..$headrev | git-apply --stat --summary