summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-messageDanny Lin2015-05-061-3/+3
* Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-211-9/+13
|\
| * refs.c: allow listing and deleting badly named refsRonnie Sahlberg2014-10-151-4/+5
| * branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg2014-10-151-3/+4
| * branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-151-1/+2
| * refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-4/+5
* | Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-201-10/+9
|\ \ | |/ |/|
| * color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-141-2/+1
| * pass config slots as pointers instead of offsetsJonathan Nieder2014-10-141-8/+8
* | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-16/+13
* | branch: clean up commit flags after merge-filter walkjk/branch-verbose-mergedJeff King2014-09-181-14/+19
* | Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano2014-09-091-1/+3
|\ \ | |/ |/|
| * prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-checkStefan Beller2014-08-121-1/+3
* | refactor skip_prefix to return a booleanJeff King2014-06-201-3/+3
|/
* use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-201-1/+1
* Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-3/+3
|\
| * replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-3/+3
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-1/+1
|\ \ | |/ |/|
| * assume parse_commit checks for NULL commitJeff King2013-10-241-1/+1
* | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-181-1/+7
|\ \
| * | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstreamTorstein Hegge2013-11-181-1/+7
* | | branch: trivial style fixFelipe Contreras2013-10-311-2/+1
* | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-201-15/+21
|\ \ \ | |/ /
| * | branch: report invalid tracking branch as goneJiang Xin2013-08-261-15/+21
| |/
* | branch, commit, name-rev: ease up boolean conditionsStefan Beller2013-08-071-1/+2
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-5/+5
|/
* branch: colour upstream branchesFelipe Contreras2013-04-151-8/+28
* Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-031-1/+3
|\
| * branch: give better message when no names specified for renameJonathon Mah2013-03-311-1/+3
* | Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano2013-04-011-1/+25
|\ \ | |/ |/|
| * status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy2013-03-231-1/+1
| * branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy2013-03-161-1/+25
* | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-03-211-0/+27
|\ \
| * | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+27
* | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-071-9/+15
|\ \ \ | |/ /
| * | branch: let branch filters imply --listJeff King2013-01-311-0/+3
| * | branch: mark more strings for translationNguyễn Thái Ngọc Duy2013-01-301-5/+6
| * | Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano2013-01-301-4/+4
| |\ \
| * | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-301-2/+2
| * | | branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy2013-01-301-2/+4
* | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow custom "comment char"Junio C Hamano2013-01-161-5/+5
| |/ /
* | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-011-4/+4
|\ \ \ | |/ / |/| / | |/
| * branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
* | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-091-1/+1
|\ \
| * | branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy2013-01-031-1/+1
| |/
* | branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-181-8/+11
* | branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-181-2/+8
* | branch: delete symref branch, not its targetRené Scharfe2012-10-181-1/+1
* | branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
View Lorry Controller Status