summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | builtin/help.c: split "-a" processing into twoPhilip Oakley2013-04-021-1/+7
* | | | | | remote-bzr: improve tag handlingFelipe Contreras2013-04-081-9/+16
* | | | | | remote-bzr: fix utf-8 support for fetchingChristophe Simonis2013-04-082-9/+19
* | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,...Junio C Hamano2013-04-082-28/+11
* | | | | | Sync with 1.8.2.1Junio C Hamano2013-04-074-3/+15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Git 1.8.2.1v1.8.2.1Junio C Hamano2013-04-073-2/+8
| * | | | | Sync with 1.8.1.6Junio C Hamano2013-04-076-21/+99
| |\ \ \ \ \
| | * | | | | Git 1.8.1.6v1.8.1.6Junio C Hamano2013-04-073-2/+8
| | * | | | | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano2013-04-073-17/+89
| | |\ \ \ \ \
| | * | | | | | remote-helpers/test-bzr.sh: do not use "grep '\s'"Torsten Bögershausen2013-04-071-1/+1
* | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-071-0/+20
* | | | | | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-073-2/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | t3600: document failure of rm across symbolic linksJeff King2013-04-041-0/+28
| * | | | | | | | t3600: test behavior of reverse-d/f conflictJeff King2013-04-041-0/+12
| * | | | | | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-043-2/+27
* | | | | | | | | Merge branch 'tb/shared-perm'Junio C Hamano2013-04-072-35/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | path.c: optimize adjust_shared_perm()Torsten Bögershausen2013-04-051-19/+23
| * | | | | | | | | path.c: simplify adjust_shared_perm()Torsten Bögershausen2013-04-052-22/+8
* | | | | | | | | | Merge branch 'cn/commit-amend-doc'Junio C Hamano2013-04-071-8/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-commit: reword the --amend explanationCarlos Martín Nieto2013-04-051-8/+9
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fc/remote-helpers-test-updates'Junio C Hamano2013-04-073-16/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote-hg: fix hg-git test-caseFelipe Contreras2013-04-041-1/+0
| * | | | | | | | | | remote-bzr: remove stale check code for testsFelipe Contreras2013-04-041-14/+0
| * | | | | | | | | | remote-helpers: fix the run of all testsFelipe Contreras2013-04-041-0/+1
| * | | | | | | | | | remote-bzr: avoid echo -nFelipe Contreras2013-04-041-1/+1
* | | | | | | | | | | Merge branch 'mg/texinfo-5'Junio C Hamano2013-04-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: Strip texinfo anchors to avoid duplicatesMartin von Gagern2013-04-031-0/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |