summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bisect: Store first bad commit as comment in log fileTorstein Hegge2013-04-152-1/+25
* Merge branch 'po/help-guides'Junio C Hamano2013-04-141-7/+7
|\
| * help: mark common_guides[] as translatableSimon Ruderich2013-04-121-7/+7
* | test-bzr: portable shell and utf-8 strings for Mac OSTorsten Bögershausen2013-04-121-19/+19
* | Sync with 'maint'Junio C Hamano2013-04-1249-85/+83
|\ \
| * \ Merge branch 'rr/test-3200-style' into maintJunio C Hamano2013-04-121-253/+267
| |\ \
| * \ \ Merge branch 'mg/texinfo-5' into maintJunio C Hamano2013-04-121-0/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/diffcore-break-divzero' into maintJunio C Hamano2013-04-121-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'cn/commit-amend-doc' into maintJunio C Hamano2013-04-121-8/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/bisect-prn-unsigned' into maintJunio C Hamano2013-04-121-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/no-more-self-assignment' into maintJunio C Hamano2013-04-122-47/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/send-email-perl-critique' into maintJunio C Hamano2013-04-121-8/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maintJunio C Hamano2013-04-121-3/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-1224-33/+33
| * | | | | | | | | | kwset: fix spelling in commentsStefano Lattarini2013-04-121-2/+2
| * | | | | | | | | | precompose-utf8: fix spelling of "want" in error messageStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | compat/nedmalloc: fix spelling in commentsStefano Lattarini2013-04-121-3/+3
| * | | | | | | | | | compat/regex: fix spelling and grammar in commentsStefano Lattarini2013-04-123-6/+6
| * | | | | | | | | | obstack: fix spelling of similarStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | contrib/subtree: fix spelling of accidentallyStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | git-remote-mediawiki: spelling fixesStefano Lattarini2013-04-124-14/+14
| * | | | | | | | | | doc: various spelling fixesStefano Lattarini2013-04-1210-13/+13
| * | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-122-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
| | * | | | | | | | | | Documentation: distinguish between ref and offset deltas in pack-formatStefan Saasen2013-04-121-1/+3
| * | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-121-8/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | i18n: make the translation of -u advice in one goJiang Xin2013-04-121-8/+4
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-04-117-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Typo fix: replacing it's -> itsBenoit Bourbie2013-04-112-3/+3
| * | | | | | | | | | | | t: make PIPE a standard test prerequisiteAdam Spiers2013-04-114-16/+10
| * | | | | | | | | | | | archive: clarify explanation of --worktree-attributesRené Scharfe2013-04-111-1/+3
| * | | | | | | | | | | | t/README: --immediate skips cleanup commands for failed testsSimon Ruderich2013-04-091-1/+4
* | | | | | | | | | | | | Update dtaft release notes to 1.8.3Junio C Hamano2013-04-111-6/+21
* | | | | | | | | | | | | Merge branch 'ap/combine-diff-coalesce-lost'Junio C Hamano2013-04-112-64/+320
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-252-64/+320
* | | | | | | | | | | | | | Merge branch 'sr/log-SG-no-textconv'Junio C Hamano2013-04-112-72/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diffcore-pickaxe: unify code for log -S/-GJeff King2013-04-051-69/+49
| * | | | | | | | | | | | | | diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"Junio C Hamano2013-04-051-5/+7
| * | | | | | | | | | | | | | diffcore-pickaxe: port optimization from has_changes() to diff_grep()Junio C Hamano2013-04-051-1/+6
| * | | | | | | | | | | | | | diffcore-pickaxe: respect --no-textconvSimon Ruderich2013-04-052-4/+36
| * | | | | | | | | | | | | | diffcore-pickaxe: remove fill_one()Jeff King2013-04-041-20/+10
| * | | | | | | | | | | | | | diffcore-pickaxe: remove unnecessary call to get_textconv()Simon Ruderich2013-04-041-9/+14
* | | | | | | | | | | | | | | Merge branch 'js/rerere-forget-protect-against-NUL'Junio C Hamano2013-04-112-10/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-042-8/+20
| * | | | | | | | | | | | | | | rerere forget: grok files containing NULJohannes Sixt2013-04-022-2/+16
* | | | | | | | | | | | | | | | Merge branch 'po/help-guides'Junio C Hamano2013-04-113-10/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | doc: include --guide option description for "git help"Philip Oakley2013-04-031-7/+21
| * | | | | | | | | | | | | | | help: mention -a and -g option, and 'git help <concept>' usage.Philip Oakley2013-04-021-1/+3
| * | | | | | | | | | | | | | | builtin/help.c: add list_common_guides_help() functionPhilip Oakley2013-04-021-3/+33
| * | | | | | | | | | | | | | | builtin/help.c: add --guide optionPhilip Oakley2013-04-021-2/+8