Merge branch 'kw/rebase-progress'

Junio C Hamano committed about 9 years ago

Merge branch 'ks/prepare-commit-msg-sample-fix'

Junio C Hamano committed about 9 years ago

Merge branch 'nm/stash-untracked'

Junio C Hamano committed about 9 years ago

Merge branch 'jt/sha1-file-cleanup'

Junio C Hamano committed about 9 years ago

treewide: correct several "up-to-date" to "up to date"

Martin Ågren committed about 9 years ago

Documentation/user-manual: update outdated example output

Martin Ågren committed about 9 years ago

vcs-svn: move remaining repo_tree functions to fast_export.h

Jonathan Nieder committed about 9 years ago

vcs-svn: remove repo_delete wrapper function

Jonathan Nieder committed about 9 years ago

vcs-svn: remove custom mode constants

Jonathan Nieder committed about 9 years ago

vcs-svn: remove more unused prototypes and declarations

Jonathan Nieder committed about 9 years ago

Doc: clarify that pack-objects makes packs, plural

Jonathan Tan committed about 9 years ago

ThreadSanitizer: add suppressions

Martin Ågren committed about 9 years ago

strbuf_setlen: don't write to strbuf_slopbuf

Martin Ågren committed about 9 years ago

refs: retry acquiring reference locks for 100ms

Michael Haggerty committed about 9 years ago

merge: save merge state earlier

Michael J Gruber committed about 9 years ago

merge: split write_merge_state in two

Michael J Gruber committed about 9 years ago

merge: clarify call chain

Michael J Gruber committed about 9 years ago

pack-objects: take lock before accessing `remaining`

Martin Ågren committed about 9 years ago

convert: always initialize attr_action in convert_attrs

Martin Ågren committed about 9 years ago

rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

Junio C Hamano committed about 9 years ago