summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
* fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-201-1/+1
|\
| * grep: correctly initialize help-all optionps/grep-help-all-callback-argPatrick Steinhardt2015-04-121-1/+1
* | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-161-4/+0
* | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-141-0/+4
|\ \
| * | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-021-0/+4
| |/
* | Merge branch 'jc/update-instead-into-void'Junio C Hamano2015-04-141-1/+20
|\ \
| * | push-to-deploy: allow pushing into an unborn branch and updating itjc/update-instead-into-voidJunio C Hamano2015-04-011-1/+20
* | | Merge branch 'sb/leaks'Junio C Hamano2015-03-273-3/+8
|\ \ \
| * | | commit.c: fix a memory leakStefan Beller2015-03-231-2/+4
| * | | builtin/apply.c: fix a memleakStefan Beller2015-03-231-1/+3
| * | | update-index: fix a memleakStefan Beller2015-03-221-0/+1
* | | | Merge branch 'jc/report-path-error-to-dir'Junio C Hamano2015-03-261-43/+0
|\ \ \ \
| * | | | report_path_error(): move to dir.cjc/report-path-error-to-dirJunio C Hamano2015-03-241-43/+0
| | |_|/ | |/| |
* | | | Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2015-03-252-2/+7
|\ \ \ \
| * | | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-201-2/+6
| * | | | prune: turn on ref_paranoia flagJeff King2015-03-201-0/+1
| * | | | Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-131-1/+141
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/cleanup-failed-clone'Junio C Hamano2015-03-251-5/+6
|\ \ \ \ \ \ \
| * | | | | | | clone: drop period from end of die_errno messagejk/cleanup-failed-cloneJeff King2015-03-191-1/+1
| * | | | | | | clone: initialize atexit cleanup handler earlierJeff King2015-03-191-4/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ws/grep-quiet-no-pager'Junio C Hamano2015-03-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pagerWilhelm Schuermann2015-03-191-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-231-8/+13
|\ \ \ \ \ \ \
| * | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-141-0/+10
| * | | | | | | cmd_push: pass "flags" pointer to config callbackJeff King2015-02-171-1/+1
| * | | | | | | cmd_push: set "atomic" bit directlyJeff King2015-02-171-5/+1
| * | | | | | | git_push_config: drop cargo-culted wt_status pointerJeff King2015-02-151-2/+1
* | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option'Junio C Hamano2015-03-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-optionJeff King2015-03-121-2/+2
* | | | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-201-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | builtin/help.c: fix memory leakStefan Beller2015-03-101-1/+2
* | | | | | | | | Merge branch 'km/bsd-shells'Junio C Hamano2015-03-201-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | help.c: use SHELL_PATH instead of hard-coded "/bin/sh"Kyle J. McKay2015-03-101-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-061-4/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-051-3/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-051-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-051-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-241-3/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-243-24/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/detached-head-report'Junio C Hamano2015-03-201-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch: name detached HEAD analogous to statusmg/detached-head-reportMichael J Gruber2015-03-061-3/+10
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-172-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-052-3/+0
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mh/expire-updateref-fixes'Junio C Hamano2015-03-101-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | reflog: improve and update documentationMichael Haggerty2015-03-051-6/+3
View Lorry Controller Status