summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-011-0/+4
|\
| * branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos 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 namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-0/+15
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-191-8/+6
|\ \ \
| * | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễ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-131-2/+9
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan 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-051-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-281-3/+21
| * branch: introduce --list optionMichael J Gruber2011-08-281-3/+9
| * git-branch: introduce missing long forms for the optionsMichael J Gruber2011-08-281-5/+5
* | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-161-1/+1
|\ \
| * | branch --set-upstream: regression fixJunio C Hamano2011-09-161-1/+1
* | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-281-5/+1
|\ \ \ | |/ /
| * | Prevent force-updating of the current branchConrad Irwin2011-08-221-5/+1
* | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-5/+2
|\ \ \ | |_|/ |/| |
| * | want_color: automatically fallback to color.uiJeff King2011-08-191-3/+0
| * | color: delay auto-color decision until point of useJeff King2011-08-191-1/+1
| * | git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-181-1/+1
| |/
* | branch -v: honor core.abbrevNamhyung Kim2011-07-011-1/+4
|/
* Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-291-1/+1
|\
| * "branch -d" can remove more than one branchesJunio C Hamano2011-06-291-1/+1
* | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-311-3/+1
|\ \ | |/ |/|
| * pretty: add pp_commit_easy function for simple callersJeff King2011-05-261-3/+1
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-34/+35
|\ \
| * | i18n: git-branch "(no branch)" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | i18n: git-branch "git branch -v" messagesÆvar Arnfjörð Bjarmason2011-03-091-3/+3
| * | i18n: git-branch "Deleted branch [...]" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | i18n: git-branch "remote branch '%s' not found" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+2
| * | i18n: git-branch basic messagesÆvar Arnfjörð Bjarmason2011-03-091-28/+28
| |/
* | branch: split off function that writes tracking info and commit subjectJonathan Nieder2011-03-161-21/+27
* | branch_merged: fix grammar in warningEric Hanchrow2011-02-271-1/+1
|/
* builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina2010-12-191-6/+1
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-121-0/+3
|\
| * branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-221-0/+3
* | branch: improve --verbose descriptionRené Scharfe2010-11-151-1/+2
* | add OPT__FORCERené Scharfe2010-11-151-1/+1
* | add description parameter to OPT__VERBOSERené Scharfe2010-11-151-1/+1
|/
* Merge branch 'sm/branch-broken-ref'Junio C Hamano2010-06-211-6/+22
|\
View Lorry Controller Status