Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 |
|\ | |||
| * | Update jk/maint-strbuf-missing-init to builtin/ rename | Junio C Hamano | 2011-12-18 |
| |\ | |||
| * | | commit, merge: initialize static strbuf | Jeff King | 2011-12-18 |
* | | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' | Junio C Hamano | 2011-12-22 |
|\ \ \ | |||
| * | | | lf_to_crlf_filter(): resurrect CRLF->CRLF hack | Junio C Hamano | 2011-12-18 |
* | | | | Merge branch 'rs/diff-tree-combined-clean-up' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ | |||
| * | | | | submodule: use diff_tree_combined_merge() instead of diff_tree_combined() | René Scharfe | 2011-12-17 |
| * | | | | pass struct commit to diff_tree_combined_merge() | René Scharfe | 2011-12-17 |
| * | | | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 |
* | | | | | Merge branch 'jk/maint-push-v-is-verbose' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ | |||
| * | | | | | make "git push -v" actually verbose | Jeff King | 2011-12-17 |
* | | | | | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | grep: disable threading in non-worktree case | Thomas Rast | 2011-12-16 |
| * | | | | | | grep: enable threading with -p and -W using lazy attribute lookup | Thomas Rast | 2011-12-16 |
| * | | | | | | grep: load funcname patterns for -W | Thomas Rast | 2011-12-12 |
* | | | | | | | Merge branch 'jk/pretty-reglog-ent' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pretty: give placeholders to reflog identity | Jeff King | 2011-12-16 |
* | | | | | | | | Merge branch 'jk/follow-rename-score' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | use custom rename score during --follow | Jeff King | 2011-12-16 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'jk/doc-fsck' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | docs: brush up obsolete bits of git-fsck manpage | Jeff King | 2011-12-16 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | commit_tree(): refuse commit messages that contain NULs | Nguyễn Thái Ngọc Duy | 2011-12-15 |
| * | | | | | | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 |
| * | | | | | | | | merge: abort if fails to commit | Nguyễn Thái Ngọc Duy | 2011-12-15 |
* | | | | | | | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | test-lib: redirect stdin of tests | Jeff King | 2011-12-15 |
* | | | | | | | | | | Merge branch 'jn/test-cleanup-7006' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | test: errors preparing for a test are not special | Jonathan Nieder | 2011-12-14 |
* | | | | | | | | | | | Merge branch 'ef/setenv-putenv' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | compat/setenv.c: error if name contains '=' | Erik Faye-Lund | 2011-12-14 |
| * | | | | | | | | | | | compat/setenv.c: update errno when erroring out | Erik Faye-Lund | 2011-12-14 |
* | | | | | | | | | | | | Merge branch 'jk/git-prompt' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | contrib: add credential helper for OS X Keychain | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | Makefile: OS X has /dev/tty | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | Makefile: linux has /dev/tty | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | credential: use git_prompt instead of git_getpass | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | prompt: use git_terminal_prompt | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | add generic terminal prompt function | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | refactor git_getpass into generic prompt function | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | move git_getpass to its own source file | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | imap-send: don't check return value of git_getpass | Jeff King | 2011-12-12 |
| * | | | | | | | | | | | | imap-send: avoid buffer overflow | Jeff King | 2011-12-12 |
* | | | | | | | | | | | | | Merge branch 'jk/http-push-to-empty' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | remote-curl: don't pass back fake refs | Jeff King | 2011-12-19 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Git 1.7.8.1v1.7.8.1 | Junio C Hamano | 2011-12-21 |
| * | | | | | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maint | Junio C Hamano | 2011-12-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/userdiff-c-returns-pointer' into maint | Junio C Hamano | 2011-12-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |