summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2016-11-22 12:14:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-22 14:43:04 -0800
commitf2627d9b19f91455a3f8b3c150da601cb72e4085 (patch)
tree508adca3036b2d0937882a97eb5cea8ed9bf7624 /Documentation/git-merge-tree.txt
parentsubmodule-config: rename commit_sha1 to treeish_name (diff)
downloadtgif-f2627d9b19f91455a3f8b3c150da601cb72e4085.tar.xz
submodule-config: clarify parsing of null_sha1 element
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Reviewed-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions