Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/index-pack-threaded-fixes' into maint | Junio C Hamano | 2013-04-04 |
|\ | |||
| * | index-pack: guard nr_resolved_deltas reads by lock | Thomas Rast | 2013-03-19 |
| * | index-pack: protect deepest_delta in multithread code | Nguyễn Thái Ngọc Duy | 2013-03-19 |
* | | Merge branch 'jk/index-pack-correct-depth-fix' into maint | Junio C Hamano | 2013-04-04 |
|\ \ | |||
| * | | index-pack: always zero-initialize object_entry list | Jeff King | 2013-03-20 |
| |/ | |||
* | | Merge branch 'mg/gpg-interface-using-status' into maint | Junio C Hamano | 2013-04-03 |
|\ \ | |||
| * | | gpg_interface: allow to request status return | Michael J Gruber | 2013-02-14 |
* | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint | Junio C Hamano | 2013-04-03 |
|\ \ \ | |||
| * | | | git-commit: only append a newline to -m mesg if necessary | Brandon Casey | 2013-02-19 |
* | | | | Merge branch 'jc/describe' into maint | Junio C Hamano | 2013-04-03 |
|\ \ \ \ | |||
| * | | | | describe: --match=<pattern> must limit the refs even when used with --all | Junio C Hamano | 2013-02-28 |
* | | | | | Merge branch 'ph/tag-force-no-warn-on-creation' into maint | Junio C Hamano | 2013-04-03 |
|\ \ \ \ \ | |||
| * | | | | | tag: --force does not have to warn when creating tags | Phil Hord | 2013-03-13 |
| |/ / / / | |||
* | | | | | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
| |\ \ \ \ \ | |||
| | * | | | | | use parse_object_or_die instead of die("bad object") | Jeff King | 2013-03-17 |
| | | |_|_|/ | | |/| | | | |||
| * | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 | Junio C Hamano | 2013-04-03 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | cat-file: Fix an gcc -Wuninitialized warning | Ramsay Jones | 2013-03-29 |
* | | | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||
| * | | | | | | | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 2013-03-27 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | mailsplit: sort maildir filenames more cleverly | Jeff King | 2013-03-02 |
* | | | | | | | | Merge branch 'nd/branch-error-cases' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | branch: segfault fixes and validation | Nguyễn Thái Ngọc Duy | 2013-02-23 |
* | | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| * | | | | | | | | update-index: allow "-h" to also display options | Antoine Pelisse | 2013-02-23 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | index-pack: fix buffer overflow caused by translations | Nguyễn Thái Ngọc Duy | 2013-03-16 |
* | | | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Fix ".git/refs" stragglers | Greg Price | 2013-02-24 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint | Junio C Hamano | 2013-03-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | reflog: fix typo in "reflog expire" clean-up codepath | Junio C Hamano | 2013-03-05 |
| | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | Merge branch 'jk/apply-similaritly-parsing' into maint | Junio C Hamano | 2013-02-25 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'zk/clean-report-failure' into maint | Junio C Hamano | 2013-02-25 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint | Junio C Hamano | 2013-02-25 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | drop some obsolete "x = x" compiler warning hacks | Jeff King | 2013-03-21 |
* | | | | | | | | | | add: update pathless 'add [-u|-A]' warning to reflect change of plan | Matthieu Moy | 2013-03-11 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||
* | | | | | | | | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-02-25 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||
| * | | | | | | | | name-hash: allow hashing an empty string | Junio C Hamano | 2013-02-19 |
* | | | | | | | | | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 |
* | | | | | | | | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink' | Junio C Hamano | 2013-02-14 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | apply: verify submodule commit object name better | Junio C Hamano | 2013-02-05 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-02-12 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Replace filepattern with pathspec for consistency | Matthieu Moy | 2013-02-12 |
| * | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||
| * | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into maint | Junio C Hamano | 2013-02-04 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/help' into maint | Junio C Hamano | 2013-02-04 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |