Merge branch 'ls/clean-smudge-override-in-config'

Junio C Hamano committed over 10 years ago

Merge branch 'ew/connect-verbose'

Junio C Hamano committed over 10 years ago

Merge branch 'cc/untracked'

Junio C Hamano committed over 10 years ago

Merge branch 'js/xmerge-marker-eol'

Junio C Hamano committed over 10 years ago

Merge branch 'nd/do-not-move-worktree-manually'

Junio C Hamano committed over 10 years ago

get_sha1: don't die() on bogus search strings

Jeff King committed over 10 years ago

check_filename: tighten dwim-wildcard ambiguity

Jeff King committed over 10 years ago

checkout: reorder check_filename conditional

Jeff King committed over 10 years ago

Documentation/git-clean.txt: don't mention deletion of .git/modules/*

Matt McCutchen committed over 10 years ago

rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id

Junio C Hamano committed about 11 years ago

rerere: split conflict ID further

Junio C Hamano committed about 11 years ago

rerere: replace strcpy with xsnprintf

Jeff King committed over 10 years ago

t9100: fix breakage when SHELL_PATH is not /bin/sh

Michael J Gruber committed over 10 years ago

test-path-utils: use xsnprintf in favor of strcpy

Jeff King committed over 10 years ago

gitignore: ignore generated test-fake-ssh executable

Johannes Schindelin committed over 10 years ago

ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

Dan Aloni committed over 10 years ago

convert.c: use text_eol_is_crlf()

Torsten Bögershausen committed over 10 years ago

convert.c: remove input_crlf_action()

Torsten Bögershausen committed over 10 years ago

convert.c: remove unused parameter 'path'

Torsten Bögershausen committed over 10 years ago

t0027: add tests for get_stream_filter()

Torsten Bögershausen committed over 10 years ago