| commit | 0941d6054524bc91f45bf3cbb1c641712b0e0e6d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:22 +0000 (13 19:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:22 +0000 (13 19:03 -0700) | ||
| tree | c2ff08811332fe9247ca57f124863d8289ba7844 | treesnapshot (tar.gz zip) |
| parent | dd57c76e84372bf16c6bdba9a1bd49da3e617339 | commitdiff |
| parent | 86a0a408b900eecc9d0d4a1eb8ae223181e96679 | commitdiff |
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
* 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