summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-081-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
* | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-071-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | branch: let branch filters imply --listJeff King2013-01-311-0/+3
| * | | | | | | | | | | | branch: mark more strings for translationNguyễn Thái Ngọc Duy2013-01-301-5/+6
| * | | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano2013-01-301-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-301-2/+2
| * | | | | | | | | | | | branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy2013-01-301-2/+4
* | | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * | | | | | | | | | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
* | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-042-30/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-261-13/+0
| * | | | | | | | | | | | | logmsg_reencode: never return NULLJeff King2013-01-262-17/+6
| * | | | | | | | | | | | | commit: drop useless xstrdup of commit messageJeff King2013-01-261-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2013-02-041-1/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add: warn when -u or -A is used without pathspecMatthieu Moy2013-01-281-1/+43
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-042-2/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: finishing touches to explain REJECT_ALREADY_EXISTS betterJunio C Hamano2013-01-241-2/+1
| * | | | | | | | | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-242-0/+40
* | | | | | | | | | | | | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-042-13/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | reflog: use parse_config_key in config callbackJeff King2013-01-231-6/+7
| * | | | | | | | | | | | | | help: use parse_config_key for man configJeff King2013-01-231-7/+7
* | | | | | | | | | | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-047-60/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Allow custom "comment char"Junio C Hamano2013-01-167-60/+86
* | | | | | | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-011-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
View Lorry Controller Status