summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | Merge branch 'rs/xdiff-lose-emit-func'Junio C Hamano2012-05-177-119/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones2012-05-141-1/+1
| * | | | | | | | | xdiff: remove unused functionsRené Scharfe2012-05-092-46/+0
| * | | | | | | | | xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-094-54/+1
| * | | | | | | | | blame: factor out helper for calling xdi_diff()René Scharfe2012-05-091-22/+16
| * | | | | | | | | blame: use hunk_func(), part 2René Scharfe2012-05-091-5/+13
| * | | | | | | | | blame: use hunk_func(), part 1René Scharfe2012-05-091-5/+12
| * | | | | | | | | xdiff: add hunk_func()René Scharfe2012-05-092-0/+22
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fc/git-complete-helper'Junio C Hamano2012-05-172-38/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: add new __git_complete helperFelipe Contreras2012-05-142-38/+34
* | | | | | | | | | Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-05-172-3/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git p4: fix bug when enabling tag import/export via config variablesLuke Diamand2012-05-111-2/+2
| * | | | | | | | | | git p4: fix bug when verbose enabled with tag exportLuke Diamand2012-05-111-1/+1
| * | | | | | | | | | git p4: add test for tag import/export enabled via configLuke Diamand2012-05-111-0/+20
* | | | | | | | | | | git-svn: clarify the referent of dcommit's optional argumentJon Seymour2012-05-171-20/+19
* | | | | | | | | | | git-svn: support rebase --preserve-mergesAvishay Lavie2012-05-162-1/+5
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Update draft release notes for 12th batchJunio C Hamano2012-05-141-24/+4
* | | | | | | | | | Merge branch 'fc/simplify-complete-revlist-file'Junio C Hamano2012-05-141-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: simplify __git_complete_revlist_fileFelipe Contreras2012-05-071-4/+2
* | | | | | | | | | | Merge branch 'nd/threaded-index-pack'Junio C Hamano2012-05-145-67/+331
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: disable threading if NO_PREAD is definedNguyễn Thái Ngọc Duy2012-05-071-0/+5
| * | | | | | | | | | | index-pack: support multithreaded delta resolvingNguyễn Thái Ngọc Duy2012-05-074-12/+244