fast-import: add (non-)relative-marks feature

Sverre Rabbelier committed almost 17 years ago

Sync with 1.6.5.5

Junio C Hamano committed almost 17 years ago

Git 1.6.5.5

Junio C Hamano committed almost 17 years ago

Fix diff -B/--dirstat miscounting of newly added contents

Linus Torvalds committed almost 17 years ago

reset: improve worktree safety valves

Jeff King committed almost 17 years ago

Documentation: Avoid use of xmlto --stringparam

Todd Zullinger committed almost 17 years ago

status -s: obey color.status

Michael J Gruber committed almost 17 years ago

builtin-commit: refactor short-status code into wt-status.c

Michael J Gruber committed almost 17 years ago

fast-import: allow for multiple --import-marks= arguments

Sverre Rabbelier committed almost 17 years ago

fast-import: test the new option command

Sverre Rabbelier committed almost 17 years ago

fast-import: add option command

Sverre Rabbelier committed almost 17 years ago

fast-import: add feature command

Sverre Rabbelier committed almost 17 years ago

fast-import: put marks reading in its own function

Sverre Rabbelier committed almost 17 years ago

fast-import: put option parsing code in separate functions

Sverre Rabbelier committed almost 17 years ago

archive: clarify description of path parameter

René Scharfe committed almost 17 years ago

rerere: don't segfault on failure to open rr-cache

Jeff King committed almost 17 years ago

Teach --[no-]rerere-autoupdate option to merge, revert and friends

Junio C Hamano committed almost 17 years ago

builtin-push: don't access freed transport->url

Tay Ray Chuan committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Prepare for 1.6.5.5

Junio C Hamano committed almost 17 years ago