summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
View Lorry Controller Status