summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-121-2/+2
|\
| * fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
* | Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano2013-04-041-8/+26
|\ \
| * | index-pack: guard nr_resolved_deltas reads by lockThomas Rast2013-03-191-1/+3
| * | index-pack: protect deepest_delta in multithread codeNguyễn Thái Ngọc Duy2013-03-191-7/+23
* | | Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
|\ \ \
| * | | index-pack: always zero-initialize object_entry listJeff King2013-03-201-0/+2
| |/ /
* | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-032-2/+2
|\ \ \
| * | | gpg_interface: allow to request status returnMichael J Gruber2013-02-142-2/+2
* | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-1/+3
|\ \ \ \
| * | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-191-1/+3
* | | | | Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
|\ \ \ \ \
| * | | | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
* | | | | | Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-031-1/+1
|\ \ \ \ \ \
| * | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-131-1/+1
| |/ / / / /
* | | | | | Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-032-6/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-032-6/+2
| |\ \ \ \ \
| | * | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| |\ \ \ \ \ \
* | | | | | | | cat-file: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-1/+1
* | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
|\ \ \ \ \ \ \
| * | | | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | | | Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-261-0/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+27
* | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy2013-03-161-4/+5
* | | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ".git/refs" stragglersGreg Price2013-02-241-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano2013-03-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano2013-03-051-1/+1
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-251-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-251-29/+125
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-251-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | drop some obsolete "x = x" compiler warning hacksJeff King2013-03-211-1/+1
* | | | | | | | | | add: update pathless 'add [-u|-A]' warning to reflect change of planMatthieu Moy2013-03-111-3/+3
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | name-hash: allow hashing an empty stringJunio C Hamano2013-02-191-1/+1
* | | | | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-171-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-071-0/+24
* | | | | | | | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-141-2/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: verify submodule commit object name betterJunio C Hamano2013-02-051-2/+38
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-122-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-122-3/+3
| * | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-071-14/+16
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-041-4/+4
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status