summaryrefslogtreecommitdiffstats
path: root/builtin/branch.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | 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"Danny 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 statusMichael 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 -dMichael J Gruber2014-12-101-4/+9
* | 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 messageJeff 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 numbersRené Scharfe2014-10-071-16/+13
* | branch: clean up commit flags after merge-filter walkJeff 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 placesStefan 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()Christian 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-251-1/+1
* | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-181-1/+7
|\ \
| * | branch: fix --verbose output column alignmentTorstein 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-04-011-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-241-1/+1
| * branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy2013-03-171-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