| commit | 998462b832258d086541b7d7009f31e32d44bfe6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:42:04 +0000 (6 15:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:42:04 +0000 (6 15:42 -0700) | ||
| tree | a6ca4c94118d8c641339bf8aa5c9b78b93515782 | treesnapshot (tar.gz zip) |
| parent | 46851fe10566b5ad43b4bfa8daeebcab0dab6b49 | commitdiff |
| parent | 86a0a408b900eecc9d0d4a1eb8ae223181e96679 | commitdiff |
Merge branch 'rs/pending' into next
* 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
* 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