Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revert: prepare to move replay_action to header | Ramkumar Ramachandra | 2012-01-11 | 1 | -18/+22 |
* | Merge branch 'rr/revert-cherry-pick' | Junio C Hamano | 2011-12-22 | 3 | -49/+90 |
|\ | |||||
| * | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pick | Ramkumar Ramachandra | 2011-12-15 | 2 | -2/+2 |
| * | t3510 (cherry-pick-sequencer): use exit status | Ramkumar Ramachandra | 2011-12-15 | 1 | -29/+29 |
| * | revert: simplify getting commit subject in format_todo() | Ramkumar Ramachandra | 2011-12-15 | 1 | -5/+5 |
| * | revert: tolerate extra spaces, tabs in insn sheet | Ramkumar Ramachandra | 2011-12-15 | 2 | -6/+23 |
| * | revert: make commit subjects in insn sheet optional | Ramkumar Ramachandra | 2011-12-15 | 2 | -21/+44 |
| * | revert: free msg in format_todo() | Ramkumar Ramachandra | 2011-12-15 | 1 | -0/+1 |
* | | Merge branch 'tr/pty-all' | Junio C Hamano | 2011-12-22 | 1 | -0/+4 |
|\ \ | |||||
| * | | test-terminal: set output terminals to raw modetr/pty-all | Thomas Rast | 2011-12-19 | 1 | -0/+4 |
* | | | Merge branch 'jn/maint-gitweb-utf8-fix' | Junio C Hamano | 2011-12-22 | 1 | -4/+8 |
|\ \ \ | |||||
| * | | | gitweb: Fix fallback mode of to_utf8 subroutinejn/maint-gitweb-utf8-fix | Jakub Narebski | 2011-12-19 | 1 | -2/+2 |
| * | | | gitweb: Output valid utf8 in git_blame_common('data') | Jürgen Kreileder | 2011-12-18 | 1 | -1/+3 |
| * | | | gitweb: esc_html() site name for title in OPML | Jürgen Kreileder | 2011-12-18 | 1 | -1/+2 |
| * | | | gitweb: Call to_utf8() on input string in chop_and_escape_str() | Jürgen Kreileder | 2011-12-18 | 1 | -0/+1 |
* | | | | Update draft release notes to 1.7.9 | Junio C Hamano | 2011-12-22 | 1 | -27/+39 |
* | | | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init | Junio C Hamano | 2011-12-18 | 1331 | -35289/+138034 |
| |\ \ \ \ | |||||
| * | | | | | commit, merge: initialize static strbuf | Jeff King | 2011-12-18 | 2 | -2/+2 |
* | | | | | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' | Junio C Hamano | 2011-12-22 | 1 | -10/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlf | Junio C Hamano | 2011-12-18 | 1 | -10/+50 |
* | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up' | Junio C Hamano | 2011-12-22 | 5 | -50/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule: use diff_tree_combined_merge() instead of diff_tree_combined()rs/diff-tree-combined-clean-up | René Scharfe | 2011-12-17 | 1 | -11/+3 |
| * | | | | | | | pass struct commit to diff_tree_combined_merge() | René Scharfe | 2011-12-17 | 3 | -8/+6 |
| * | | | | | | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | 4 | -37/+26 |
* | | | | | | | | 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 |