Merge branch 'cb/rebase-am-exit-code' into maint

Junio C Hamano committed about 11 years ago

Merge branch 'jk/index-pack-reduce-recheck' into maint

Junio C Hamano committed about 11 years ago

refs: loosen restriction on wildcard "*" refspecs

Jacob Keller committed about 11 years ago

refs: cleanup comments regarding check_refname_component()

Jacob Keller committed about 11 years ago

l10n: zh_CN: Update Translation: "tag object"

Ray Chen committed about 11 years ago

Documentation/git: drop outdated Cogito reference

Eric Sunshine committed about 11 years ago

rerere: un-nest merge() further

Junio C Hamano committed about 11 years ago

rerere: use "struct rerere_id" instead of "char *" for conflict ID

Junio C Hamano committed about 11 years ago

rerere: call conflict-ids IDs

Junio C Hamano committed about 11 years ago

rerere: further clarify do_rerere_one_path()

Junio C Hamano committed about 11 years ago

rerere: further de-dent do_plain_rerere()

Junio C Hamano committed about 11 years ago

rerere: refactor "replay" part of do_plain_rerere()

Junio C Hamano committed over 11 years ago

rerere: explain the remainder

Junio C Hamano committed over 11 years ago

rerere: explain "rerere forget" codepath

Junio C Hamano committed over 11 years ago

rerere: explain the primary codepath

Junio C Hamano committed over 11 years ago

rerere: explain MERGE_RR management helpers

Junio C Hamano committed over 11 years ago

rerere: fix benign off-by-one non-bug and clarify code

Junio C Hamano committed about 11 years ago

rerere: explain the rerere I/O abstraction

Junio C Hamano committed over 11 years ago

rerere: do not leak mmfile[] for a path with multiple stage #1 entries

Junio C Hamano committed about 11 years ago

rerere: stop looping unnecessarily

Junio C Hamano committed over 11 years ago