summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-281-1/+1
* Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-171-2/+2
|\
| * create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-091-2/+2
* | i18n: branch: mark option description for translationVasco Almeida2016-09-151-1/+1
* | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-251-8/+11
|\ \
| * | delete_branches(): use resolve_refdup()Michael Haggerty2016-06-131-8/+11
* | | Merge branch 'jk/write-file'Junio C Hamano2016-07-191-4/+1
|\ \ \
| * | | branch: use write_file_buf instead of write_filejk/write-fileJeff King2016-07-081-1/+1
| * | | branch: use non-gentle write_file for branch descriptionJeff King2016-07-081-4/+1
| | |/ | |/|
* | | i18n: branch: mark comment when editing branch description for translationVasco Almeida2016-06-171-3/+3
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-4/+29
|\ \
| * | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-0/+25
| * | worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-221-4/+4
| |/
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-171-2/+1
|\ \
| * | builtin/branch.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
* | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-171-5/+7
|\ \ \ | |_|/ |/| |
| * | i18n: branch: move comment for translatorsVasco Almeida2016-04-131-2/+4
| * | i18n: branch: unmark string for translationVasco Almeida2016-04-131-2/+2
| * | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-081-1/+1
| |/
* | Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-181-7/+12
|\ \
| * | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-7/+12
| |/
* | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-181-2/+1
|\ \
| * | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-2/+1
| |/
* | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-8/+14
|/
* config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-221-3/+3
* branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-221-3/+2
* branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-221-2/+2
* Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
* Merge branch 'tk/stripspace'Junio C Hamano2015-10-261-1/+1
|\
| * strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-1/+1
* | Merge branch 'kn/for-each-branch'Junio C Hamano2015-10-151-352/+150
|\ \
| * | branch: add '--points-at' optionKarthik Nayak2015-09-251-1/+6
| * | branch.c: use 'ref-filter' APIsKarthik Nayak2015-09-251-178/+35
| * | branch.c: use 'ref-filter' data structuresKarthik Nayak2015-09-251-189/+128
| * | branch: drop non-commit error reportingKarthik Nayak2015-09-251-14/+4
| * | branch: move 'current' check down to the presentation layerKarthik Nayak2015-09-231-11/+9
| * | branch: roll show_detached HEAD into regular ref_listKarthik Nayak2015-09-231-28/+33
| * | branch: bump get_head_description() to the topKarthik Nayak2015-09-231-31/+31
| * | branch: refactor width computationKarthik Nayak2015-09-231-30/+34
| * | Merge 'kn/for-each-tag-branch' into kn/for-each-tagJunio C Hamano2015-08-241-12/+10
| |\ \
* | \ \ Merge branch 'kn/for-each-tag-branch'Junio C Hamano2015-10-051-12/+10
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | parse-options.h: add macros for '--contains' optionKarthik Nayak2015-08-031-12/+2
| * | parse-option: rename parse_opt_with_commit()Karthik Nayak2015-08-031-2/+2
| * | ref-filter: implement '--merged' and '--no-merged' optionsKarthik Nayak2015-08-031-0/+4
| * | ref-filter: add parse_opt_merge_filter()Karthik Nayak2015-08-031-0/+4
* | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-241-1/+1
| |/ |/|
* | delete_ref(): use the usual convention for old_sha1mh/init-delete-refs-apiMichael Haggerty2015-06-221-1/+2
* | check_branch_commit(): make first parameter constMichael Haggerty2015-06-221-1/+1
|/
* Merge branch 'bc/object-id'Junio C Hamano2015-06-051-2/+2
|\