summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-181-1/+1
|\
| * Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-1/+1
* | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-071-3/+3
|\ \
| * | branch: change the error messages to be more meaningfulks/branch-tweak-error-message-for-extra-argsKaartic Sivaraam2017-10-041-3/+3
| |/
* | Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-071-2/+3
|\ \
| * | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-releaseStefan Beller2017-10-041-2/+3
| |/
* | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-051-1/+1
|\ \
| * | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-021-1/+1
* | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-15/+47
|\ \ \ | |/ / |/| |
| * | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-241-6/+3
| * | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-16/+51
* | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-171-22/+3
| |/ |/|
* | ref-filter: consult want_color() before emitting colorsjk/ref-filter-colorsJeff King2017-07-131-0/+1
* | color: check color.ui in git_default_config()Jeff King2017-07-131-1/+1
* | ref-filter: abstract ref format into its own structJeff King2017-07-131-7/+7
* | check return value of verify_ref_format()Jeff King2017-07-131-1/+3
* | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-121-6/+9
|\ \
| * | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-091-2/+3
| * | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ | |_|/ |/| |
| * | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-3/+3
|/ /
* | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-3/+3
|\ \
| * | branch: add edit_description() helperJeff King2017-04-201-3/+3
| * | Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-281-1/+4
| |\ \
* | \ \ Merge branch 'ab/ref-filter-no-contains'Junio C Hamano2017-04-111-1/+4
|\ \ \ \
| * | | | ref-filter: add --no-contains option to tag/branch/for-each-refÆvar Arnfjörð Bjarmason2017-03-241-1/+4
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-03-171-13/+13
|\ \ \ \ \
| * | | | | builtin/branch: convert to struct object_idbrian m. carlson2017-02-221-13/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-03-141-4/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | branch: honor --abbrev/--no-abbrev in --list modeJunio C Hamano2017-03-101-4/+15
* | | | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | branch: restrict @-expansions when deletingJeff King2017-03-021-1/+4
| * | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+1
* | | | Merge branch 'km/delete-ref-reflog-message'Junio C Hamano2017-02-271-3/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-201-2/+3
| * | | delete_ref: accept a reflog message argumentKyle Meyer2017-02-201-1/+1
| | |/ | |/|
* | | branch: implement '--format' optionKarthik Nayak2017-01-311-5/+9
* | | branch: use ref-filter printing APIsKarthik Nayak2017-01-311-162/+85
* | | branch, tag: use porcelain outputKarthik Nayak2017-01-311-0/+2
* | | ref-filter: move get_head_description() from branch.cKarthik Nayak2017-01-101-33/+0
|/ /
* | Merge branch 'nd/for-each-ref-ignore-case'Junio C Hamano2016-12-191-9/+14
|\ \ | |/ |/|
| * tag, branch, for-each-ref: add --ignore-case for sorting and filteringnd/for-each-ref-ignore-caseNguyễn Thái Ngọc Duy2016-12-051-9/+14
* | 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
View Lorry Controller Status