text
stringlengths
0
9.36M
/ / / / \ /
---o---o---o---o---o---o---o---o---o---o---o "master"
A, B and C are topic branches.
* A has one fix since it was merged up to "next".
* B has finished. It has been fully merged up to "master" and "next",
and is ready to be deleted.
* C has not merged to "next" at all.
We would want to allow C to be rebased, refuse A, and encourage
B to be deleted.
To compute (1):
git rev-list ^master ^topic next
git rev-list ^master next
if these match, topic has not merged in next at all.
To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".
DOC_END
File: .git/hooks/pre-applypatch.sample
Contents:
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:
File: .git/hooks/pre-receive.sample
Contents:
#!/bin/sh
#
# An example hook script to make use of push options.
# The example simply echoes all push options that start with 'echoback='
# and rejects all pushes when the "reject" push option is used.
#
# To enable this hook, rename this file to "pre-receive".
if test -n "$GIT_PUSH_OPTION_COUNT"
then
i=0
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
do
eval "value=\$GIT_PUSH_OPTION_$i"
case "$value" in
echoback=*)
echo "echo from the pre-receive-hook: ${value#*=}" >&2
;;
reject)
exit 1
esac
i=$((i + 1))
done
fi
File: .git/refs/heads/master
Contents:
2ba6484b42af864ae5e903bbe4f93256915c27f2
File: .git/refs/remotes/origin/HEAD
Contents:
ref: refs/remotes/origin/master
File: .git/objects/pack/pack-856d01c074e1368189310019e55fea1340340a5f.pack
Contents:
PACKo+xusk@i?wSBXZ ۲KHʢ_>{|3|lrY@,K(Rʢ 5FD EEx=$AQֺ$BV%@](,h"DO4
0f#OvKX *kMA]0w*S?z
;Mf55xvPD 89ؿXnfi1 x kV҈ .B',u(J+?֬躝a)
6|_"Zc~Ƣ2j\s~ڼcMôcIs@HRO]!9~ 9Mb_ pKǹFPG)DMlj b&Km6fع[K)#~%/{2{o$*nmx`}pL-8÷xNp<۰6}>m*i)S+X!>;f$:GzgG[.gwx/g<׍X6%W۰ǎ|c;+xuɎ@D|E߭M <ϭib>NrMTzRJUyI% ʼ bPxbɨ%S
#@dB2'9!beeNs,慄URp&~
z#og`Qn^Q*p^a'mkBs޺~ķQ<Uj+;i9>ĎkI8(N:5MjZ2 ~"~tVM+lьS{{xKJ
K
:Wm͌ǍqW-яzȥqvQ;@'u
i]|μgeG69ﲉ*{4ӛDɄݾX.^?Y:j(̣滗NKˍ3p-ƹaI(<-Fû9 XP`Dz
R[2Ϸ J#1(;|64 .Za|)9:,p
U z>.Sqf͘sη:Bn0S}DufƿQ魀 |m_w+xuK0ܭ
BxTl
!z $ (KyO]_UoLy!S9E
L0ċ
T3P2*դe$<?S*3*|cdTVa<g*GtHZ>/בW^ޫ߀GTABEY  [V_Ϗ?λ"oMY[Zi}hpp`p5