aboutsummaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAge
* Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-07
|\
| * branch: let branch filters imply --listJeff King2013-01-31
| * branch: mark more strings for translationNguyễn Thái Ngọc Duy2013-01-30
| * Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano2013-01-30
| |\
| * | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-30
| * | branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy2013-01-30
* | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \ \
| * | | Allow custom "comment char"Junio C Hamano2013-01-16
| |/ /
* | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-01
|\ \ \ | |/ / |/| / | |/
| * branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-30
* | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-09
|\ \
| * | branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy2013-01-03
| |/
* | branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-18
* | branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-18
* | branch: delete symref branch, not its targetRené Scharfe2012-10-18
* | branch: factor out delete_branch_config()René Scharfe2012-10-18
* | branch: factor out check_branch_commit()René Scharfe2012-10-18
* | Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-14
|\ \
| * | Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-04
| |/
* | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-11
|\ \
| * | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-27
* | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-10
|\ \ \
| * | | branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-30
| * | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-30
| * | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-23
| | |/ | |/|
* | | Merge branch 'nd/branch-v-alignment'Junio C Hamano2012-09-07
|\ \ \
| * | | branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy2012-08-27
| |/ /
* | | i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
|/ /
* | branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy2012-05-04
* | Merge branch 'nd/columns'Junio C Hamano2012-05-03
|\ \
| * | branch: add --columnNguyễn Thái Ngọc Duy2012-04-27
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-02
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-04-30
* | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-30
|/ / /
* | | teach "git branch" a --quiet optionJeff King2012-03-26
* | | checkout: suppress tracking message with "-q"Jeff King2012-03-26
| |/ |/|
* | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-04
|\ \ | |/ |/|
| * branch: don't assume the merge filter ref existsCarlos Martín Nieto2012-02-27
| * Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-28
| |\
* | | branch --edit-description: protect against mistyped branch nameJunio C Hamano2012-02-05
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-19
|\ \ \
| * | | Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2011-12-13
| * | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-13
* | | | Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-13
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Allow checkout -B <current-branch> to update the current branchJonathan Nieder2011-11-28
| * | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-28
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-09
|\ \ \
| * | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-05
| * | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-13
| |/ /
* | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-09
|\ \ \ | |_|/ |/| |