reset: the command takes committish

Junio C Hamano committed over 14 years ago

commit-tree: the command wants a tree and commits

Junio C Hamano committed over 14 years ago

apply: --build-fake-ancestor expects blobs

Junio C Hamano committed over 14 years ago

sha1_name.c: add support for disambiguating other types

Junio C Hamano committed over 14 years ago

revision.c: the "log" family, except for "show", takes committish

Junio C Hamano committed over 14 years ago

revision.c: allow handle_revision_arg() to take other flags

Junio C Hamano committed over 14 years ago

sha1_name.c: introduce get_sha1_committish()

Junio C Hamano committed over 14 years ago

sha1_name.c: teach lookup context to get_sha1_with_context()

Junio C Hamano committed over 14 years ago

sha1_name.c: many short names can only be committish

Junio C Hamano committed over 14 years ago

sha1_name.c: get_sha1_1() takes lookup flags

Junio C Hamano committed over 14 years ago

sha1_name.c: get_describe_name() by definition groks only commits

Junio C Hamano committed over 14 years ago

rerere: make rr-cache fanout directory honor umask

Junio C Hamano committed over 14 years ago

apply: document --3way option

Junio C Hamano committed over 14 years ago

apply: allow rerere() to work on --3way results

Junio C Hamano committed over 14 years ago

apply: register conflicted stages to the index

Junio C Hamano committed over 14 years ago

apply: --3way with add/add conflict

Junio C Hamano committed over 14 years ago

apply: move verify_index_match() higher

Junio C Hamano committed over 14 years ago

apply: plug the three-way merge logic in

Junio C Hamano committed over 14 years ago

apply: fall back on three-way merge

Junio C Hamano committed over 14 years ago

apply: accept -3/--3way command line option

Junio C Hamano committed over 14 years ago