summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-112-9/+5
|\
| * git-config: replace use of home_config_paths()Paul Tan2015-05-061-4/+2
| * git-commit: replace use of home_config_paths()Paul Tan2015-05-061-5/+3
* | Merge branch 'jc/hash-object'Junio C Hamano2015-05-111-3/+1
|\ \
| * | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-051-3/+1
* | | Merge branch 'sb/prefix-path-free-results'Junio C Hamano2015-05-112-13/+10
|\ \ \
| * | | prefix_path(): unconditionally free results in the callerssb/prefix-path-free-resultsStefan Beller2015-05-052-13/+10
* | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'Junio C Hamano2015-05-111-2/+2
|\ \ \ \
| * | | | config: use error() instead of fprintf(stderr, ...)jn/clean-use-error-not-fprintf-on-stderrJonathan Nieder2015-05-041-2/+2
| |/ / /
* | | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-111-0/+1
|\ \ \ \
| * | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-031-0/+1
* | | | | Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano2015-05-111-5/+11
|\ \ \ \ \
| * | | | | fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leakJunio C Hamano2015-04-201-5/+11
* | | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-05-111-111/+179
|\ \ \ \ \ \
| * | | | | | index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy2015-04-181-100/+160
| * | | | | | index-pack: reduce object_entry size to save memoryNguyễn Thái Ngọc Duy2015-02-271-11/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings'Junio C Hamano2015-05-111-3/+1
|\ \ \ \ \ \
| * | | | | | sha1_file: squelch "packfile cannot be accessed" warningsjk/sha1-file-reduce-useless-warningsJeff King2015-03-301-3/+1
* | | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-1114-47/+413
|\ \ \ \ \ \ \
| * | | | | | | prune --worktrees: fix expire vs worktree existence conditionMax Kirillov2015-03-311-3/+7
| * | | | | | | checkout: add --ignore-other-wortreesNguyễn Thái Ngọc Duy2015-01-071-1/+5
| * | | | | | | checkout: pass whole struct to parse_branchname_arg instead of individual flagsNguyễn Thái Ngọc Duy2015-01-071-7/+6
| * | | | | | | checkout: do not fail if target is an empty directoryMax Kirillov2014-12-011-1/+1
| * | | | | | | checkout: don't require a work tree when checking out into a new oneDennis Kaarsemaker2014-12-011-0/+3
| * | | | | | | count-objects: report unused files in $GIT_DIR/worktrees/...Nguyễn Thái Ngọc Duy2014-12-011-1/+3
| * | | | | | | gc: support prune --worktreesNguyễn Thái Ngọc Duy2014-12-011-0/+10
| * | | | | | | gc: factor out gc.pruneexpire parsing codeNguyễn Thái Ngọc Duy2014-12-011-10/+12
| * | | | | | | gc: style change -- no SP before closing parenthesisNguyễn Thái Ngọc Duy2014-12-011-1/+1
| * | | | | | | checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy2014-12-011-0/+48
| * | | | | | | checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy2014-12-011-2/+84
| * | | | | | | prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy2014-12-012-2/+112
| * | | | | | | checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy2014-12-011-2/+93
| * | | | | | | use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy2014-12-012-9/+2
| * | | | | | | setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy2014-12-011-0/+4
| * | | | | | | commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy2014-12-011-1/+1
| * | | | | | | reflog: avoid constructing .lock path with git_pathNguyễn Thái Ngọc Duy2014-12-011-1/+1
| * | | | | | | git_path(): be aware of file relocation in $GIT_DIRNguyễn Thái Ngọc Duy2014-12-011-0/+7
| * | | | | | | git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy2014-12-011-5/+8
| * | | | | | | path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy2014-12-017-14/+18
* | | | | | | | Merge branch 'oh/fix-config-default-user-name-section'Junio C Hamano2015-05-051-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-2/+2
* | | | | | | | | Merge branch 'ts/checkout-advice-plural'Junio C Hamano2015-05-051-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: call a single commit "it" intead of "them"ts/checkout-advice-pluralThomas Schneider2015-04-021-2/+9
* | | | | | | | | | Merge branch 'jk/init-core-worktree-at-root'Junio C Hamano2015-05-051-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-rootJeff King2015-04-021-3/+15
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/show-branch-topic'Junio C Hamano2015-05-051-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | show-branch: show all local heads when only giving one rev along --topicsmh/show-branch-topicMike Hommey2015-03-311-3/+3
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-05-052-24/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | apply: convert threeway_stage to object_idbrian m. carlson2015-03-131-7/+7
| * | | | | | | | | patch-id: convert to use struct object_idbrian m. carlson2015-03-131-17/+17
View Lorry Controller Status