Merge branch 'jh/fast-import-notes'

Junio C Hamano committed almost 15 years ago

Merge branch 'jk/upload-archive-use-start-command'

Junio C Hamano committed almost 15 years ago

Merge git://ozlabs.org/~paulus/gitk

Junio C Hamano committed almost 15 years ago

docs: brush up obsolete bits of git-fsck manpage

Jeff King committed almost 15 years ago

grep: disable threading in non-worktree case

Thomas Rast committed almost 15 years ago

grep: enable threading with -p and -W using lazy attribute lookup

Thomas Rast committed almost 15 years ago

lf_to_crlf_filter(): tell the caller we added "\n" when draining

Junio C Hamano committed almost 15 years ago

pretty: give placeholders to reflog identity

Jeff King committed almost 15 years ago

use custom rename score during --follow

Jeff King committed almost 15 years ago

request-pull: update the "pull" command generation logic

Junio C Hamano committed almost 15 years ago

t3502, t3510: clarify cherry-pick -m failure

Ramkumar Ramachandra committed almost 15 years ago

t3510 (cherry-pick-sequencer): use exit status

Ramkumar Ramachandra committed almost 15 years ago

revert: simplify getting commit subject in format_todo()

Ramkumar Ramachandra committed almost 15 years ago

revert: tolerate extra spaces, tabs in insn sheet

Ramkumar Ramachandra committed almost 15 years ago

revert: make commit subjects in insn sheet optional

Ramkumar Ramachandra committed almost 15 years ago

revert: free msg in format_todo()

Ramkumar Ramachandra committed almost 15 years ago

commit_tree(): refuse commit messages that contain NULs

Nguyễn Thái Ngọc Duy committed almost 15 years ago

Convert commit_tree() to take strbuf as message

Nguyễn Thái Ngọc Duy committed almost 15 years ago

merge: abort if fails to commit

Nguyễn Thái Ngọc Duy committed almost 15 years ago

test-lib: redirect stdin of tests

Jeff King committed almost 15 years ago