summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-252-6/+2
|\
| * use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
* | Merge branch 'jk/fast-export-object-lookup'Junio C Hamano2013-03-251-9/+13
|\ \
| * | fast-export: do not load blob objects twiceJeff King2013-03-171-6/+10
| * | fast-export: rename handle_object functionJeff King2013-03-171-3/+3
* | | Merge branch 'ph/tag-force-no-warn-on-creation'Junio C Hamano2013-03-251-1/+1
|\ \ \
| * | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-131-1/+1
| |/ /
* | | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-251-0/+2
|\ \ \
| * | | push: --follow-tagsJunio C Hamano2013-03-051-0/+2
| |/ /
* | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'Junio C Hamano2013-03-251-1/+1
|\ \ \
| * | | reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano2013-03-051-1/+1
| |/ /
* | | Merge branch 'jc/describe'Junio C Hamano2013-03-251-21/+20
|\ \ \
| * | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
| |/ /
| * | 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
| |\ \ \ \
* | \ \ \ \ Merge branch 'maint'Junio C Hamano2013-03-211-1/+1
|\ \ \ \ \ \
| * | | | | | drop some obsolete "x = x" compiler warning hacksJeff King2013-03-211-1/+1
* | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort'Junio C Hamano2013-03-211-0/+23
|\ \ \ \ \ \ \
| * | | | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | | | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-212-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gpg_interface: allow to request status returnMichael J Gruber2013-02-142-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-03-211-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'Junio C Hamano2013-03-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option'Junio C Hamano2013-03-211-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-191-1/+3
* | | | | | | | | | Merge branch 'nd/count-garbage'Junio C Hamano2013-03-211-7/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | count-objects: report how much disk space taken by garbage filesNguyễn Thái Ngọc Duy2013-02-151-6/+12
| * | | | | | | | | | count-objects: report garbage files in pack directory tooNguyễn Thái Ngọc Duy2013-02-151-1/+11
* | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-8/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch: use struct ref to represent refs to be fetchedJunio C Hamano2013-02-071-8/+32
* | | | | | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow'Junio C Hamano2013-03-211-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'Junio C Hamano2013-03-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix ".git/refs" stragglersGreg Price2013-02-241-2/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/help' into maintJunio C Hamano2013-02-041-18/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-042-37/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status