fast-import doc: remove suggested 16-parent limit

Jonathan Nieder committed over 11 years ago

Sync with 2.3.5

Junio C Hamano committed over 11 years ago

Git 2.3.5

Junio C Hamano committed over 11 years ago

Merge branch 'ss/pull-rebase-preserve' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/report-path-error-to-dir' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'ph/push-doc-cas' into maint

Junio C Hamano committed over 11 years ago

gitweb.conf.txt: say "build-time", not "built-time"

Jérôme Zago committed over 12 years ago

streaming.c: fix a memleak

John Keeping committed over 11 years ago

show-branch: show all local heads when only giving one rev along --topics

Mike Hommey committed over 11 years ago

prune --worktrees: fix expire vs worktree existence condition

Max Kirillov committed over 11 years ago

enter_repo(): fix docs to match code

Paul Tan committed over 11 years ago

wt-status.c: fix a memleak

Stefan Beller committed over 11 years ago

line-log.c: fix a memleak

Stefan Beller committed over 11 years ago

cherry-pick: fix docs describing handling of empty commits

Jeff King committed over 11 years ago

sha1_file: squelch "packfile cannot be accessed" warnings

Jeff King committed over 11 years ago

l10n: vi.po: Updated Vietnamese translation

Tran Ngoc Quan committed over 11 years ago

l10n: zh_CN: translations for git v2.4.0-rc0

Jiang Xin committed over 11 years ago

Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git

Jiang Xin committed over 11 years ago

docs: clarify what git-rebase's "-p" / "--preserve-merges" does

Sebastian Schuberth committed over 11 years ago

l10n: fr.po v2.4.0-rc0 round 1

Jean-Noel Avila committed over 11 years ago