summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-232-2/+25
* Merge branch 'tr/grep-threading'Junio C Hamano2011-12-224-43/+88
|\
| * grep: disable threading in non-worktree casetr/grep-threadingThomas Rast2011-12-161-18/+18
| * grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-163-33/+63
| * grep: load funcname patterns for -WThomas Rast2011-12-122-3/+18
* | Merge branch 'jk/pretty-reglog-ent'Junio C Hamano2011-12-225-0/+48
|\ \
| * | pretty: give placeholders to reflog identityjk/pretty-reglog-entJeff King2011-12-165-0/+48
* | | Merge branch 'jk/follow-rename-score'Junio C Hamano2011-12-221-0/+1
|\ \ \
| * | | use custom rename score during --followjk/follow-rename-scoreJeff King2011-12-161-0/+1
| |/ /
* | | Merge branch 'jk/doc-fsck'Junio C Hamano2011-12-221-18/+8
|\ \ \
| * | | docs: brush up obsolete bits of git-fsck manpagejk/doc-fsckJeff King2011-12-161-18/+8
| |/ /
* | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-2210-17/+33
|\ \ \
| * | | commit_tree(): refuse commit messages that contain NULsnd/war-on-nul-in-commitNguyễn Thái Ngọc Duy2011-12-152-0/+9
| * | | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-159-15/+20
| * | | merge: abort if fails to commitNguyễn Thái Ngọc Duy2011-12-151-2/+4
* | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests'Junio C Hamano2011-12-221-1/+2
|\ \ \ \
| * | | | test-lib: redirect stdin of testsjk/maint-do-not-feed-stdin-to-testsJeff King2011-12-151-1/+2
* | | | | Merge branch 'jn/test-cleanup-7006'Junio C Hamano2011-12-221-56/+17
|\ \ \ \ \
| * | | | | test: errors preparing for a test are not specialjn/test-cleanup-7006Jonathan Nieder2011-12-141-56/+17
* | | | | | Merge branch 'ef/setenv-putenv'Junio C Hamano2011-12-221-2/+8
|\ \ \ \ \ \
| * | | | | | compat/setenv.c: error if name contains '='ef/setenv-putenvErik Faye-Lund2011-12-141-1/+1
| * | | | | | compat/setenv.c: update errno when erroring outErik Faye-Lund2011-12-141-2/+8
* | | | | | | Merge branch 'jk/git-prompt'Junio C Hamano2011-12-2212-60/+374
|\ \ \ \ \ \ \
| * | | | | | | contrib: add credential helper for OS X Keychainjk/git-promptJeff King2011-12-123-0/+188
| * | | | | | | Makefile: OS X has /dev/ttyJeff King2011-12-121-0/+1
| * | | | | | | Makefile: linux has /dev/ttyJeff King2011-12-121-0/+1
| * | | | | | | credential: use git_prompt instead of git_getpassJeff King2011-12-121-8/+7
| * | | | | | | prompt: use git_terminal_promptJeff King2011-12-122-1/+3
| * | | | | | | add generic terminal prompt functionJeff King2011-12-123-0/+96
| * | | | | | | refactor git_getpass into generic prompt functionJeff King2011-12-122-16/+33
| * | | | | | | move git_getpass to its own source fileJeff King2011-12-127-45/+58
| * | | | | | | imap-send: don't check return value of git_getpassJeff King2011-12-121-4/+0
| * | | | | | | imap-send: avoid buffer overflowJeff King2011-12-121-3/+4
* | | | | | | | Merge branch 'jk/http-push-to-empty'Junio C Hamano2011-12-222-3/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-emptyJeff King2011-12-192-3/+36
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Sync with v1.7.8.1Junio C Hamano2011-12-215-14/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-211-4/+25
| * | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano2011-12-211-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-211-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-213-6/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano2011-12-211-14/+40
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filterJunio C Hamano2011-12-161-5/+7
| * | | | | | | | | | | | Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2011-12-212-4/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: the -o option has nothing to do with <branch>Carlos Martín Nieto2011-12-211-2/+2
| * | | | | | | | | | | | | builtin/log: remove redundant initializationMichael Schubert2011-12-211-2/+0
| * | | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano2011-12-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstringMichael Schubert2011-12-211-1/+1
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-12-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-201-1/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mh/ref-api'Junio C Hamano2011-12-203-258/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \