Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-push-v-is-verbose' | Junio C Hamano | 2011-12-22 | 1 | -5/+5 |
|\ | |||||
| * | make "git push -v" actually verbosejk/maint-push-v-is-verbose | Jeff King | 2011-12-17 | 1 | -5/+5 |
* | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 | 4 | -43/+88 |
|\ \ | |||||
| * | | grep: disable threading in non-worktree casetr/grep-threading | Thomas Rast | 2011-12-16 | 1 | -18/+18 |
| * | | grep: enable threading with -p and -W using lazy attribute lookup | Thomas Rast | 2011-12-16 | 3 | -33/+63 |
| * | | grep: load funcname patterns for -W | Thomas Rast | 2011-12-12 | 2 | -3/+18 |
* | | | Merge branch 'jk/pretty-reglog-ent' | Junio C Hamano | 2011-12-22 | 5 | -0/+48 |
|\ \ \ | |||||
| * | | | pretty: give placeholders to reflog identityjk/pretty-reglog-ent | Jeff King | 2011-12-16 | 5 | -0/+48 |
* | | | | Merge branch 'jk/follow-rename-score' | Junio C Hamano | 2011-12-22 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | use custom rename score during --followjk/follow-rename-score | Jeff King | 2011-12-16 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jk/doc-fsck' | Junio C Hamano | 2011-12-22 | 1 | -18/+8 |
|\ \ \ \ | |||||
| * | | | | docs: brush up obsolete bits of git-fsck manpagejk/doc-fsck | Jeff King | 2011-12-16 | 1 | -18/+8 |
| |/ / / | |||||
* | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | 10 | -17/+33 |
|\ \ \ \ | |||||
| * | | | | commit_tree(): refuse commit messages that contain NULsnd/war-on-nul-in-commit | Nguyễn Thái Ngọc Duy | 2011-12-15 | 2 | -0/+9 |
| * | | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 | 9 | -15/+20 |
| * | | | | merge: abort if fails to commit | Nguyễn Thái Ngọc Duy | 2011-12-15 | 1 | -2/+4 |
* | | | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' | Junio C Hamano | 2011-12-22 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib: redirect stdin of testsjk/maint-do-not-feed-stdin-to-tests | Jeff King | 2011-12-15 | 1 | -1/+2 |
* | | | | | | Merge branch 'jn/test-cleanup-7006' | Junio C Hamano | 2011-12-22 | 1 | -56/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test: errors preparing for a test are not specialjn/test-cleanup-7006 | Jonathan Nieder | 2011-12-14 | 1 | -56/+17 |
* | | | | | | | Merge branch 'ef/setenv-putenv' | Junio C Hamano | 2011-12-22 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compat/setenv.c: error if name contains '='ef/setenv-putenv | Erik Faye-Lund | 2011-12-14 | 1 | -1/+1 |
| * | | | | | | | compat/setenv.c: update errno when erroring out | Erik Faye-Lund | 2011-12-14 | 1 | -2/+8 |
* | | | | | | | | Merge branch 'jk/git-prompt' | Junio C Hamano | 2011-12-22 | 12 | -60/+374 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | contrib: add credential helper for OS X Keychainjk/git-prompt | Jeff King | 2011-12-12 | 3 | -0/+188 |
| * | | | | | | | | Makefile: OS X has /dev/tty | Jeff King | 2011-12-12 | 1 | -0/+1 |
| * | | | | | | | | Makefile: linux has /dev/tty | Jeff King | 2011-12-12 | 1 | -0/+1 |
| * | | | | | | | | credential: use git_prompt instead of git_getpass | Jeff King | 2011-12-12 | 1 | -8/+7 |
| * | | | | | | | | prompt: use git_terminal_prompt | Jeff King | 2011-12-12 | 2 | -1/+3 |
| * | | | | | | | | add generic terminal prompt function | Jeff King | 2011-12-12 | 3 | -0/+96 |
| * | | | | | | | | refactor git_getpass into generic prompt function | Jeff King | 2011-12-12 | 2 | -16/+33 |
| * | | | | | | | | move git_getpass to its own source file | Jeff King | 2011-12-12 | 7 | -45/+58 |
| * | | | | | | | | imap-send: don't check return value of git_getpass | Jeff King | 2011-12-12 | 1 | -4/+0 |
| * | | | | | | | | imap-send: avoid buffer overflow | Jeff King | 2011-12-12 | 1 | -3/+4 |
* | | | | | | | | | Merge branch 'jk/http-push-to-empty' | Junio C Hamano | 2011-12-22 | 2 | -3/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-empty | Jeff King | 2011-12-19 | 2 | -3/+36 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 | 5 | -14/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Git 1.7.8.1v1.7.8.1 | Junio C Hamano | 2011-12-21 | 1 | -4/+25 |
| * | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maint | Junio C Hamano | 2011-12-21 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'tr/userdiff-c-returns-pointer' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 3 | -6/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cn/maint-lf-to-crlf-filter' into maint | Junio C Hamano | 2011-12-21 | 1 | -14/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filter | Junio C Hamano | 2011-12-16 | 1 | -5/+7 |
| * | | | | | | | | | | | | | Merge branch 'jk/maint-upload-archive' into maint | Junio C Hamano | 2011-12-21 | 2 | -4/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | clone: the -o option has nothing to do with <branch> | Carlos Martín Nieto | 2011-12-21 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | builtin/log: remove redundant initialization | Michael Schubert | 2011-12-21 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstring | Michael Schubert | 2011-12-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |