]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd57c76 86a0a40)
Merge branch 'rs/pending'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
commit0941d6054524bc91f45bf3cbb1c641712b0e0e6d
treec2ff08811332fe9247ca57f124863d8289ba7844tree | snapshot
parentdd57c76e84372bf16c6bdba9a1bd49da3e617339commit | diff
parent86a0a408b900eecc9d0d4a1eb8ae223181e96679commit | diff
Merge branch 'rs/pending'

* rs/pending:
  commit: factor out clear_commit_marks_for_object_array
  checkout: use leak_pending flag
  bundle: use leak_pending flag
  bisect: use leak_pending flag
  revision: add leak_pending flag
  checkout: use add_pending_{object,sha1} in orphan check
  revision: factor out add_pending_sha1
  checkout: check for "Previous HEAD" notice in t2020

Conflicts:
builtin/checkout.c
revision.c
bisect.c diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
bundle.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
commit.h diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
revision.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.