]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e63f87a baf18fc)
Merge branch 'nd/maint-autofix-tag-in-head' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)
commitd25a265220f7e9a50693d0ec4bb05c7be0539d69
tree34bf878cbc1181b0614ad7ba210d48f0ad550fa3tree | snapshot
parente63f87a6f7a4e55f50e67b112f26d9a1e4e7f3abcommit | diff
parentbaf18fc261ca475343fe3cb9cd2c0dded4bc1bb7commit | diff
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
builtin/commit.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
commit.h diff1 | diff2 | blob | history
http-push.c diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.