summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-261-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' into maintJunio C Hamano2016-05-021-7/+12
|\ \
| * | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-7/+12
| |/
* | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-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
|\
| * append_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
| * each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-1/+3
* | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-051-16/+8
|\ \ | |/ |/|
| * remote.c: return upstream name from stat_tracking_infoJeff King2015-05-221-11/+5
| * remote.c: report specific errors from branch_get_upstreamJeff King2015-05-211-1/+1
| * remote.c: introduce branch_get_upstream helperJeff King2015-05-211-5/+3
* | Merge branch 'dl/branch-error-message'Junio C Hamano2015-05-221-3/+3
|\ \
| * | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-messageDanny Lin2015-05-061-3/+3
* | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-3/+1
|\ \ \ | |_|/ |/| |
| * | use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy2014-12-011-3/+1
| |/
* | 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
* | | standardize usage info string formatAlex Henrie2015-01-141-4/+4
|/ /
* | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-221-4/+9
|\ \ | |/ |/|
| * branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-091-4/+9
View Lorry Controller Status