summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano2012-05-251-15/+15
|\
| * xdiff: import new 32-bit version of count_masked_bytes()René Scharfe2012-05-231-13/+5
| * xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-231-1/+7
| * xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-221-3/+5
* | Merge branch 'mh/ref-api'Junio C Hamano2012-05-251-0/+6
|\ \
| * | Avoid sorting if references are added to ref_cache in orderMichael Haggerty2012-05-241-0/+6
* | | Merge branch 'rs/maint-grep-F'Junio C Hamano2012-05-255-24/+68
|\ \ \
| * | | grep: stop leaking line strings with -fRené Scharfe2012-05-211-5/+2
| * | | grep: support newline separated pattern listRené Scharfe2012-05-204-3/+41
| * | | grep: factor out do_append_grep_pat()René Scharfe2012-05-201-6/+9
| * | | grep: factor out create_grep_pat()René Scharfe2012-05-201-11/+17
* | | | Sync with 1.7.10.3Junio C Hamano2012-05-253-10/+21
|\ \ \ \
| * | | | Git 1.7.10.3v1.7.10.3Junio C Hamano2012-05-252-5/+16
| * | | | Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-254-2/+39
| |\ \ \ \
| * \ \ \ \ Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2012-05-252-2/+27
| |\ \ \ \ \
| * | | | | | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
| * | | | | | config doc: remove confusion about relative GIT_DIR from FILES sectionJonathan Nieder2012-05-251-3/+1
* | | | | | | Sync with maintJunio C Hamano2012-05-242-2/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update draft release notes to 1.7.10.3Junio C Hamano2012-05-241-0/+6
| * | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-245-89/+105
| |\ \ \ \ \ \
| * | | | | | | osxkeychain: pull make config from top-level directoryJeff King2012-05-241-2/+5
* | | | | | | | Update draft release notes to 1.7.11Junio C Hamano2012-05-231-0/+13
* | | | | | | | Merge branch 'rs/archive-tree-in-tip-simplify'Junio C Hamano2012-05-232-14/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | archive-tar: keep const in checksum calculationRené Scharfe2012-05-181-2/+2
| * | | | | | | | archive: simplify refname handlingRené Scharfe2012-05-181-12/+5
* | | | | | | | | Merge branch 'js/rev-parse-doc-fix'Junio C Hamano2012-05-231-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-parse doc: --git-dir does not always show a relative pathJon Seymour2012-05-181-1/+2
* | | | | | | | | | Merge branch 'js/rebase-i-p-test-fix'Junio C Hamano2012-05-231-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix t3411.3 to actually rebase somethingJohannes Sixt2012-05-181-0/+1
* | | | | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix'Junio C Hamano2012-05-232-2/+27
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | diff --no-index: don't leak buffers in queue_diffBobby Powers2012-05-161-2/+2
| * | | | | | | | | | diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2012-05-162-0/+25
* | | | | | | | | | | Merge branch 'hv/submodule-alt-odb'Junio C Hamano2012-05-234-2/+39
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-144-2/+39
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | remote: fix typoRalf Thielow2012-05-201-1/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-05-204-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-203-4/+4
| * | | | | | | | | t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
* | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-05-174-941/+2332
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint' into masterJiang Xin2012-05-162-130/+116
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | l10n: de.po: translate 3 new messagesRalf Thielow2012-05-151-101/+127
| | * | | | | | | | | l10n: zh_CN.po: translate 3 new messagesJiang Xin2012-05-151-99/+121
| * | | | | | | | | | Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PTJiang Xin2012-05-151-585/+1970
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: pt_PT.po translate new messagesMarco Sousa2012-05-151-585/+1970
| * | | | | | | | | | | l10n: Update git.pot (8 new, 4 removed messages)Jiang Xin2012-05-151-226/+246
| * | | | | | | | | | | Merge branch 'maint'Jiang Xin2012-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | l10n: Update git.pot (3 new, 2 removed messages)Jiang Xin2012-05-151-96/+108
* | | | | | | | | | | | Merge branch 'nd/i18n-parseopt'Junio C Hamano2012-05-173-50/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-05-081-31/+31
| * | | | | | | | | | | | i18n: parseopt: lookup help and argument translations when showing usageNguyễn Thái Ngọc Duy2012-05-082-19/+25