summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-07-20 10:40:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-20 14:58:26 -0700
commitc7be7201a7b71f590325f0d858f909a4c0b443f6 (patch)
tree1880ae1f4b6a9811f249c43f62e1c62167f613ae /Documentation/howto/using-merge-subtree.txt
parentpush: propagate remote and refspec with --recurse-submodules (diff)
downloadtgif-c7be7201a7b71f590325f0d858f909a4c0b443f6.tar.xz
submodule--helper: teach push-check to handle HEAD
In 06bf4ad1d (push: propagate remote and refspec with --recurse-submodules) push was taught how to propagate a refspec down to submodules when the '--recurse-submodules' flag is given. The only refspecs that are allowed to be propagated are ones which name a ref which exists in both the superproject and the submodule, with the caveat that 'HEAD' was disallowed. This patch teaches push-check (the submodule helper which determines if a refspec can be propagated to a submodule) to permit propagating 'HEAD' if and only if the superproject and the submodule both have the same named branch checked out and the submodule is not in a detached head state. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions