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