summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-21 17:49:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-21 17:49:26 (GMT)
commitd25a265220f7e9a50693d0ec4bb05c7be0539d69 (patch)
tree34bf878cbc1181b0614ad7ba210d48f0ad550fa3 /Documentation
parente63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab (diff)
parentbaf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (diff)
downloadgit-d25a265220f7e9a50693d0ec4bb05c7be0539d69.zip
git-d25a265220f7e9a50693d0ec4bb05c7be0539d69.tar.gz
git-d25a265220f7e9a50693d0ec4bb05c7be0539d69.tar.bz2
Merge branch 'nd/maint-autofix-tag-in-head' into maint
* nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions