Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/format-person-part-buffer-limit' | Junio C Hamano | 2012-05-25 | 1 | -2/+4 |
|\ | |||||
| * | pretty: avoid buffer overflow in format_person_part | Jeff King | 2012-05-22 | 1 | -2/+4 |
* | | Merge branch 'jk/pretty-commit-header-incomplete-line' | Junio C Hamano | 2012-05-25 | 1 | -1/+4 |
|\ \ | |||||
| * | | avoid segfault when reading header of malformed commits | Jeff King | 2012-05-22 | 1 | -1/+4 |
* | | | Merge branch 'jk/ident-split-fix' | Junio C Hamano | 2012-05-25 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | fix off-by-one error in split_ident_line | Jeff King | 2012-05-22 | 2 | -1/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/xdiff-fast-hash-fix' | Junio C Hamano | 2012-05-25 | 1 | -15/+15 |
|\ \ \ | |||||
| * | | | xdiff: import new 32-bit version of count_masked_bytes() | René Scharfe | 2012-05-23 | 1 | -13/+5 |
| * | | | xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 2012-05-23 | 1 | -1/+7 |
| * | | | xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 2012-05-22 | 1 | -3/+5 |
* | | | | Merge branch 'mh/ref-api' | Junio C Hamano | 2012-05-25 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Avoid sorting if references are added to ref_cache in order | Michael Haggerty | 2012-05-24 | 1 | -0/+6 |
* | | | | | Merge branch 'rs/maint-grep-F' | Junio C Hamano | 2012-05-25 | 5 | -24/+68 |
|\ \ \ \ \ | |||||
| * | | | | | grep: stop leaking line strings with -f | René Scharfe | 2012-05-21 | 1 | -5/+2 |
| * | | | | | grep: support newline separated pattern list | René Scharfe | 2012-05-20 | 4 | -3/+41 |
| * | | | | | grep: factor out do_append_grep_pat() | René Scharfe | 2012-05-20 | 1 | -6/+9 |
| * | | | | | grep: factor out create_grep_pat() | René Scharfe | 2012-05-20 | 1 | -11/+17 |
* | | | | | | Sync with 1.7.10.3 | Junio C Hamano | 2012-05-25 | 3 | -10/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git 1.7.10.3v1.7.10.3 | Junio C Hamano | 2012-05-25 | 2 | -5/+16 |
| * | | | | | | Merge branch 'hv/submodule-alt-odb' into maint | Junio C Hamano | 2012-05-25 | 4 | -2/+39 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'bp/diff-no-index-strbuf-fix' into maint | Junio C Hamano | 2012-05-25 | 2 | -2/+27 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fmt-merge-message: add empty line between tag and signature verification | Linus Torvalds | 2012-05-25 | 1 | -3/+5 |
| * | | | | | | | | config doc: remove confusion about relative GIT_DIR from FILES section | Jonathan Nieder | 2012-05-25 | 1 | -3/+1 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2012-05-24 | 2 | -2/+11 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Update draft release notes to 1.7.10.3 | Junio C Hamano | 2012-05-24 | 1 | -0/+6 |
| * | | | | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maint | Junio C Hamano | 2012-05-24 | 5 | -89/+105 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | osxkeychain: pull make config from top-level directory | Jeff King | 2012-05-24 | 1 | -2/+5 |
* | | | | | | | | | | Update draft release notes to 1.7.11 | Junio C Hamano | 2012-05-23 | 1 | -0/+13 |
* | | | | | | | | | | Merge branch 'rs/archive-tree-in-tip-simplify' | Junio C Hamano | 2012-05-23 | 2 | -14/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | archive-tar: keep const in checksum calculation | René Scharfe | 2012-05-18 | 1 | -2/+2 |
| * | | | | | | | | | | archive: simplify refname handling | René Scharfe | 2012-05-18 | 1 | -12/+5 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'js/rev-parse-doc-fix' | Junio C Hamano | 2012-05-23 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-parse doc: --git-dir does not always show a relative path | Jon Seymour | 2012-05-18 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'js/rebase-i-p-test-fix' | Junio C Hamano | 2012-05-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix t3411.3 to actually rebase something | Johannes Sixt | 2012-05-18 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix' | Junio C Hamano | 2012-05-23 | 2 | -2/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | diff --no-index: don't leak buffers in queue_diff | Bobby Powers | 2012-05-16 | 1 | -2/+2 |
| * | | | | | | | | | | | diff --no-index: reset temporary buffer lengths on directory iteration | Bobby Powers | 2012-05-16 | 2 | -0/+25 |
* | | | | | | | | | | | | Merge branch 'hv/submodule-alt-odb' | Junio C Hamano | 2012-05-23 | 4 | -2/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | teach add_submodule_odb() to look for alternates | Heiko Voigt | 2012-05-14 | 4 | -2/+39 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | remote: fix typo | Ralf Thielow | 2012-05-20 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-05-20 | 4 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Consistently use "superproject" instead of "supermodule" | Jens Lehmann | 2012-05-20 | 3 | -4/+4 |
| * | | | | | | | | | | t3404: begin "exchange commits with -p" test with correct preconditions | Johannes Sixt | 2012-05-20 | 1 | -0/+1 |
* | | | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-05-17 | 4 | -941/+2332 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint' into master | Jiang Xin | 2012-05-16 | 2 | -130/+116 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | l10n: de.po: translate 3 new messages | Ralf Thielow | 2012-05-15 | 1 | -101/+127 |
| | * | | | | | | | | | | l10n: zh_CN.po: translate 3 new messages | Jiang Xin | 2012-05-15 | 1 | -99/+121 |
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PT | Jiang Xin | 2012-05-15 | 1 | -585/+1970 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | l10n: pt_PT.po translate new messages | Marco Sousa | 2012-05-15 | 1 | -585/+1970 |