summaryrefslogtreecommitdiffstats
path: root/builtin/branch.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
* Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-141-1/+1
|\
| * Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-041-1/+1
* | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-2/+2
|\ \
| * | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-281-2/+2
* | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-111-3/+57
|\ \ \
| * | | branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-301-0/+26
| * | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-3/+18
| * | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-2/+15
| | |/ | |/|
* | | Merge branch 'nd/branch-v-alignment'Junio C Hamano2012-09-071-13/+15
|\ \ \
| * | | branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy2012-08-271-13/+15
| |/ /
* / / i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-28/+28
|/ /
* | branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy2012-05-041-9/+23
* | Merge branch 'nd/columns'Junio C Hamano2012-05-041-4/+28
|\ \
| * | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-4/+28
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-021-1/+1
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-05-011-1/+1
* | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-9/+15
|/ / /
* | | teach "git branch" a --quiet optionJeff King2012-03-271-6/+10
* | | checkout: suppress tracking message with "-q"Jeff King2012-03-271-1/+1
| |/ |/|
* | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-051-0/+4
|\ \ | |/ |/|
| * branch: don't assume the merge filter ref existsCarlos Martín Nieto2012-02-271-0/+4
| * Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-281-2/+9
| |\
* | | branch --edit-description: protect against mistyped branch nameJunio C Hamano2012-02-061-0/+15
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-201-8/+6
|\ \ \
| * | | Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2011-12-131-1/+1
| * | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-7/+5
* | | | Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-141-2/+9
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Allow checkout -B <current-branch> to update the current branchJonathan Nieder2011-11-281-1/+1
| * | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-1/+8
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-4/+6
|\ \ \
| * | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-061-1/+4
| * | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-3/+2
| |/ /
* | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-091-3/+55
|\ \ \ | |_|/ |/| |
| * | branch: teach --edit-description optionJunio C Hamano2011-10-051-2/+54
* | | builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn2011-11-231-2/+2
| |/ |/|
* | branch -m: handle no arg properlyTay Ray Chuan2011-11-021-5/+8
* | Merge branch 'mg/branch-list'Junio C Hamano2011-10-051-11/+34
|\ \ | |/ |/|
| * branch: -v does not automatically imply --listMichael J Gruber2011-09-081-2/+1
| * branch: allow pattern argumentsMichael J Gruber2011-08-291-3/+21
| * branch: introduce --list optionMichael J Gruber2011-08-291-3/+9
| * git-branch: introduce missing long forms for the optionsMichael J Gruber2011-08-291-5/+5
* | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-171-1/+1
|\ \
| * | branch --set-upstream: regression fixJunio C Hamano2011-09-171-1/+1
* | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-291-5/+1
|\| |
| * | Prevent force-updating of the current branchConrad Irwin2011-08-231-5/+1