aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-22
|\
| * Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano2011-12-18
| |\
| * | commit, merge: initialize static strbufJeff King2011-12-18
* | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf'Junio C Hamano2011-12-22
|\ \ \
| * | | lf_to_crlf_filter(): resurrect CRLF->CRLF hackJunio C Hamano2011-12-18
* | | | Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano2011-12-22
|\ \ \ \
| * | | | submodule: use diff_tree_combined_merge() instead of diff_tree_combined()René Scharfe2011-12-17
| * | | | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-17
| * | | | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-17
* | | | | Merge branch 'jk/maint-push-v-is-verbose'Junio C Hamano2011-12-22
|\ \ \ \ \
| * | | | | make "git push -v" actually verboseJeff King2011-12-17
* | | | | | Merge branch 'tr/grep-threading'Junio C Hamano2011-12-22
|\ \ \ \ \ \
| * | | | | | grep: disable threading in non-worktree caseThomas Rast2011-12-16
| * | | | | | grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-16
| * | | | | | grep: load funcname patterns for -WThomas Rast2011-12-12
* | | | | | | Merge branch 'jk/pretty-reglog-ent'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \
| * | | | | | | pretty: give placeholders to reflog identityJeff King2011-12-16
* | | | | | | | Merge branch 'jk/follow-rename-score'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \
| * | | | | | | | use custom rename score during --followJeff King2011-12-16
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/doc-fsck'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: brush up obsolete bits of git-fsck manpageJeff King2011-12-16
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \
| * | | | | | | | commit_tree(): refuse commit messages that contain NULsNguyễn Thái Ngọc Duy2011-12-15
| * | | | | | | | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-15
| * | | | | | | | merge: abort if fails to commitNguyễn Thái Ngọc Duy2011-12-15
* | | | | | | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: redirect stdin of testsJeff King2011-12-15
* | | | | | | | | | Merge branch 'jn/test-cleanup-7006'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test: errors preparing for a test are not specialJonathan Nieder2011-12-14
* | | | | | | | | | | Merge branch 'ef/setenv-putenv'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | compat/setenv.c: error if name contains '='Erik Faye-Lund2011-12-14
| * | | | | | | | | | | compat/setenv.c: update errno when erroring outErik Faye-Lund2011-12-14
* | | | | | | | | | | | Merge branch 'jk/git-prompt'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | contrib: add credential helper for OS X KeychainJeff King2011-12-12
| * | | | | | | | | | | | Makefile: OS X has /dev/ttyJeff King2011-12-12
| * | | | | | | | | | | | Makefile: linux has /dev/ttyJeff King2011-12-12
| * | | | | | | | | | | | credential: use git_prompt instead of git_getpassJeff King2011-12-12
| * | | | | | | | | | | | prompt: use git_terminal_promptJeff King2011-12-12
| * | | | | | | | | | | | add generic terminal prompt functionJeff King2011-12-12
| * | | | | | | | | | | | refactor git_getpass into generic prompt functionJeff King2011-12-12
| * | | | | | | | | | | | move git_getpass to its own source fileJeff King2011-12-12
| * | | | | | | | | | | | imap-send: don't check return value of git_getpassJeff King2011-12-12
| * | | | | | | | | | | | imap-send: avoid buffer overflowJeff King2011-12-12
* | | | | | | | | | | | | Merge branch 'jk/http-push-to-empty'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote-curl: don't pass back fake refsJeff King2011-12-19
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Sync with v1.7.8.1Junio C Hamano2011-12-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-21
| * | | | | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano2011-12-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \