summaryrefslogtreecommitdiff
path: root/builtin-branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/branch-d'Junio C Hamano2010-01-221-10/+54
|\
| * branch -d: base the "already-merged" safety on the branch it merges withJunio C Hamano2009-12-301-10/+54
* | Add branch --set-upstreamIlari Liusvaara2010-01-181-0/+2
* | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-12-311-2/+4
|\ \ | |/ |/|
| * branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-311-2/+4
* | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-161-1/+3
|\ \
| * | ignore unknown color configurationJeff King2009-12-161-1/+3
* | | Refactor pretty_print_commit arguments into a structThomas Rast2009-10-191-1/+2
|/ /
* | UI consistency: allow --force for where -f means forceRené Scharfe2009-08-291-1/+1
* | Merge branch 'maint'Junio C Hamano2009-07-241-27/+39
|\ \
| * | git branch: clean up detached branch handlingLinus Torvalds2009-07-231-15/+23
| * | git branch: avoid unnecessary object lookupsLinus Torvalds2009-07-231-10/+14
| * | git branch: fix performance problemLinus Torvalds2009-07-231-5/+5
* | | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+2
* | | allow -t abbreviation for --track in git branchSitaram Chamarty2009-05-091-1/+1
|/ /
* | shorten_unambiguous_ref(): add strict modeBert Wesarg2009-04-131-2/+2
* | branch: show upstream branch when double verboseJeff King2009-04-071-6/+17
* | Merge branch 'jc/name-branch'Junio C Hamano2009-04-061-14/+18
|\ \
| * | check_ref_format(): tighten refname rulesJunio C Hamano2009-03-241-2/+14
| * | strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano2009-03-221-6/+2
| * | Fix branch -m @{-1} newnameJunio C Hamano2009-03-221-7/+7
| * | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-221-5/+1
| * | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-1/+1
* | | Merge branch 'bc/maint-1.6.1-branch-deleted-was'Junio C Hamano2009-03-261-1/+1
|\ \ \ | |/ / |/| |
| * | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-211-1/+1
* | | Merge branch 'js/branch-symref'Junio C Hamano2009-03-051-32/+79
|\ \ \
| * | | branch: clean up repeated strlenJeff King2009-02-181-2/+2
| * | | Avoid segfault with 'git branch' when the HEAD is detachedJohannes Schindelin2009-02-181-0/+2
| * | | builtin-branch: improve output when displaying remote branchesJay Soffian2009-02-131-30/+75
* | | | Merge branch 'al/ansi-color'Junio C Hamano2009-03-051-21/+21
|\ \ \ \
| * | | | builtin-branch.c: Rename branch category color namesArjen Laarhoven2009-02-131-16/+16
| * | | | Clean up use of ANSI color sequencesArjen Laarhoven2009-02-131-5/+5
| |/ / /
* | | | Teach the "@{-1} syntax to "git branch"Junio C Hamano2009-02-131-12/+19
|/ / /
* | | Make has_commit() non-staticJake Goulding2009-01-281-17/+3
* | | Make opt_parse_with_commit() non-staticJake Goulding2009-01-281-18/+2
|/ /
* | git-branch: display sha1 on branch deletionBrandon Casey2008-12-121-1/+2
* | builtin-branch: use strbuf in rename_branch()Miklos Vajna2008-11-181-18/+21
* | builtin-branch: use strbuf in fill_tracking_info()Miklos Vajna2008-11-181-10/+8
* | builtin-branch: use strbuf in delete_branches()Miklos Vajna2008-11-181-4/+4
* | Merge branch 'mv/maint-branch-m-symref'Junio C Hamano2008-11-051-1/+1
|\ \ | |/
| * Fix git branch -m for symrefs.Miklos Vajna2008-10-261-1/+1
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-2/+1
|/
* builtin-branch: fix -v for --[no-]mergedLars Hjemli2008-07-271-0/+15
* builtin-branch: factor out merge_filter matchingLars Hjemli2008-07-271-5/+13
* builtin-branch: remove duplicated codeLars Hjemli2008-07-271-7/+2
* builtin-branch.c: optimize --merged and --no-mergedJunio C Hamano2008-07-231-21/+38
* builtin-branch.c: remove unused code in append_ref() callback functionJunio C Hamano2008-07-231-7/+3
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-4/+4
|\
| * Make usage strings dash-lessStephan Beyer2008-07-131-4/+4
* | Merge branch 'jc/branch-merged'Junio C Hamano2008-07-141-12/+50
|\ \