summaryrefslogtreecommitdiff
path: root/builtin/branch.c
AgeCommit message (Expand)AuthorFilesLines
2016-05-02Merge branch 'jk/branch-shortening-funny-symrefs' into maintLibravatar Junio C Hamano1-7/+12
2016-05-02Merge branch 'ky/branch-m-worktree' into maintLibravatar Junio C Hamano1-2/+1
2016-04-04branch: fix shortening of non-remote symrefsLibravatar Jeff King1-7/+12
2016-04-04branch -m: update all per-worktree HEADsLibravatar Kazuki Yamaguchi1-2/+1
2016-03-29branch -d: refuse deleting a branch which is currently checked outLibravatar Kazuki Yamaguchi1-8/+14
2016-02-22config: rename git_config_set_or_die to git_config_setLibravatar Patrick Steinhardt1-3/+3
2016-02-22branch: die on config error when editing branch descriptionLibravatar Patrick Steinhardt1-3/+2
2016-02-22branch: die on config error when unsetting upstreamLibravatar Patrick Steinhardt1-2/+2
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-1/+1
2015-10-26Merge branch 'tk/stripspace'Libravatar Junio C Hamano1-1/+1
2015-10-16strbuf: make stripspace() part of strbufLibravatar Tobias Klauser1-1/+1
2015-10-15Merge branch 'kn/for-each-branch'Libravatar Junio C Hamano1-352/+150
2015-10-05Merge branch 'kn/for-each-tag-branch'Libravatar Junio C Hamano1-12/+10
2015-09-25branch: add '--points-at' optionLibravatar Karthik Nayak1-1/+6
2015-09-25branch.c: use 'ref-filter' APIsLibravatar Karthik Nayak1-178/+35
2015-09-25branch.c: use 'ref-filter' data structuresLibravatar Karthik Nayak1-189/+128
2015-09-25branch: drop non-commit error reportingLibravatar Karthik Nayak1-14/+4
2015-09-23branch: move 'current' check down to the presentation layerLibravatar Karthik Nayak1-11/+9
2015-09-23branch: roll show_detached HEAD into regular ref_listLibravatar Karthik Nayak1-28/+33
2015-09-23branch: bump get_head_description() to the topLibravatar Karthik Nayak1-31/+31
2015-09-23branch: refactor width computationLibravatar Karthik Nayak1-30/+34
2015-08-24Merge 'kn/for-each-tag-branch' into kn/for-each-tagLibravatar Junio C Hamano1-12/+10
2015-08-24write_file(): drop "fatal" parameterLibravatar Junio C Hamano1-1/+1
2015-08-03parse-options.h: add macros for '--contains' optionLibravatar Karthik Nayak1-12/+2
2015-08-03parse-option: rename parse_opt_with_commit()Libravatar Karthik Nayak1-2/+2
2015-08-03ref-filter: implement '--merged' and '--no-merged' optionsLibravatar Karthik Nayak1-0/+4
2015-08-03ref-filter: add parse_opt_merge_filter()Libravatar Karthik Nayak1-0/+4
2015-06-22delete_ref(): use the usual convention for old_sha1Libravatar Michael Haggerty1-1/+2
2015-06-22check_branch_commit(): make first parameter constLibravatar Michael Haggerty1-1/+1
2015-06-05Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2015-06-05Merge branch 'jk/at-push-sha1'Libravatar Junio C Hamano1-16/+8
2015-05-25append_ref(): rewrite to take an object_id argumentLibravatar Michael Haggerty1-5/+3
2015-05-25each_ref_fn: change to take an object_id parameterLibravatar Michael Haggerty1-1/+3
2015-05-22Merge branch 'dl/branch-error-message'Libravatar Junio C Hamano1-3/+3
2015-05-22remote.c: return upstream name from stat_tracking_infoLibravatar Jeff King1-11/+5
2015-05-21remote.c: report specific errors from branch_get_upstreamLibravatar Jeff King1-1/+1
2015-05-21remote.c: introduce branch_get_upstream helperLibravatar Jeff King1-5/+3
2015-05-11Merge branch 'nd/multiple-work-trees'Libravatar Junio C Hamano1-3/+1
2015-05-06branch: do not call a "remote-tracking branch" a "remote branch"Libravatar Danny Lin1-3/+3
2015-03-20Merge branch 'mg/detached-head-report'Libravatar Junio C Hamano1-3/+10
2015-03-06branch: name detached HEAD analogous to statusLibravatar Michael J Gruber1-3/+10
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-4/+4
2014-12-22Merge branch 'mg/branch-d-m-f'Libravatar Junio C Hamano1-4/+9
2014-12-09branch: allow -f with -m and -dLibravatar Michael J Gruber1-4/+9
2014-12-01use new wrapper write_file() for simple file writingLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2014-10-21Merge branch 'rs/ref-transaction'Libravatar Junio C Hamano1-9/+13
2014-10-20Merge branch 'jn/parse-config-slot'Libravatar Junio C Hamano1-10/+9
2014-10-15refs.c: allow listing and deleting badly named refsLibravatar Ronnie Sahlberg1-4/+5
2014-10-15branch -d: simplify by using RESOLVE_REF_READINGLibravatar Ronnie Sahlberg1-3/+4