aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/branch.c
AgeCommit message (Expand)AuthorFilesLines
2015-06-05Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2015-06-05Merge branch 'jk/at-push-sha1'Junio C Hamano1-16/+8
2015-05-25append_ref(): rewrite to take an object_id argumentMichael Haggerty1-5/+3
2015-05-25each_ref_fn: change to take an object_id parameterMichael Haggerty1-1/+3
2015-05-22Merge branch 'dl/branch-error-message'Junio C Hamano1-3/+3
2015-05-22remote.c: return upstream name from stat_tracking_infoJeff King1-11/+5
2015-05-21remote.c: report specific errors from branch_get_upstreamJeff King1-1/+1
2015-05-21remote.c: introduce branch_get_upstream helperJeff King1-5/+3
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-3/+1
2015-05-06branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin1-3/+3
2015-03-20Merge branch 'mg/detached-head-report'Junio C Hamano1-3/+10
2015-03-06branch: name detached HEAD analogous to statusMichael J Gruber1-3/+10
2015-01-14standardize usage info string formatAlex Henrie1-4/+4
2014-12-22Merge branch 'mg/branch-d-m-f'Junio C Hamano1-4/+9
2014-12-09branch: allow -f with -m and -dMichael J Gruber1-4/+9
2014-12-01use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy1-3/+1
2014-10-21Merge branch 'rs/ref-transaction'Junio C Hamano1-9/+13
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano1-10/+9
2014-10-15refs.c: allow listing and deleting badly named refsRonnie Sahlberg1-4/+5
2014-10-15branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg1-3/+4
2014-10-15branch -d: avoid repeated symref resolutionJonathan Nieder1-1/+2
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-4/+5
2014-10-14color_parse: do not mention variable name in error messageJeff King1-2/+1
2014-10-14pass config slots as pointers instead of offsetsJonathan Nieder1-8/+8
2014-10-07use skip_prefix() to avoid more magic numbersRené Scharfe1-16/+13
2014-09-18branch: clean up commit flags after merge-filter walkJeff King1-14/+19
2014-09-09Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano1-1/+3
2014-08-12prepare_revision_walk(): check for return value in all placesStefan Beller1-1/+3
2014-06-20refactor skip_prefix to return a booleanJeff King1-3/+3
2014-02-20use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy1-1/+1
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-3/+3
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-3/+3
2013-12-05Merge branch 'jk/robustify-parse-commit'Junio C Hamano1-1/+1
2013-11-18Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano1-1/+7
2013-11-18branch: fix --verbose output column alignmentTorstein Hegge1-1/+7
2013-10-31branch: trivial style fixFelipe Contreras1-2/+1
2013-10-24assume parse_commit checks for NULL commitJeff King1-1/+1
2013-09-20Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano1-15/+21
2013-08-26branch: report invalid tracking branch as goneJiang Xin1-15/+21
2013-08-07branch, commit, name-rev: ease up boolean conditionsStefan Beller1-1/+2
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-5/+5
2013-04-15branch: colour upstream branchesFelipe Contreras1-8/+28
2013-04-03Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano1-1/+3
2013-04-01Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano1-1/+25
2013-03-31branch: give better message when no names specified for renameJonathon Mah1-1/+3
2013-03-23status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy1-1/+1
2013-03-21Merge branch 'nd/branch-error-cases'Junio C Hamano1-0/+27
2013-03-16branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy1-1/+25
2013-02-23branch: segfault fixes and validationNguyễn Thái Ngọc Duy1-0/+27
2013-02-07Merge branch 'nd/branch-error-cases'Junio C Hamano1-9/+15
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano1-5/+5
2013-02-01Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano1-4/+4
2013-01-31branch: let branch filters imply --listJeff King1-0/+3
2013-01-30branch: mark more strings for translationNguyễn Thái Ngọc Duy1-5/+6
2013-01-30Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano1-4/+4
2013-01-30branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy1-2/+2
2013-01-30branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy1-2/+4
2013-01-30branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy1-4/+4
2013-01-16Allow custom "comment char"Junio C Hamano1-5/+5
2013-01-09Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano1-1/+1
2013-01-03branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy1-1/+1
2012-10-18branch: show targets of deleted symrefs, not sha1sRené Scharfe1-8/+11
2012-10-18branch: skip commit checks when deleting symref branchesRené Scharfe1-2/+8
2012-10-18branch: delete symref branch, not its targetRené Scharfe1-1/+1
2012-10-18branch: factor out delete_branch_config()René Scharfe1-5/+10
2012-10-18branch: factor out check_branch_commit()René Scharfe1-12/+21
2012-09-14Merge branch 'rj/path-cleanup'Junio C Hamano1-1/+1
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano1-2/+2
2012-09-10Merge branch 'cn/branch-set-upstream-to'Junio C Hamano1-3/+57
2012-09-07Merge branch 'nd/branch-v-alignment'Junio C Hamano1-13/+15
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones1-1/+1
2012-08-30branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto1-0/+26
2012-08-30branch: add --unset-upstream optionCarlos Martín Nieto1-3/+18
2012-08-27in_merge_bases(): support only one "other" commitJunio C Hamano1-2/+2
2012-08-27branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy1-13/+15
2012-08-23branch: introduce --set-upstream-toCarlos Martín Nieto1-2/+15
2012-08-20i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-28/+28
2012-05-04branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy1-9/+23
2012-05-03Merge branch 'nd/columns'Junio C Hamano1-4/+28
2012-05-02Merge branch 'pw/message-cleanup'Junio C Hamano1-1/+1
2012-04-30remove superfluous newlines in error messagesPete Wyckoff1-1/+1
2012-04-30git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason1-9/+15
2012-04-27branch: add --columnNguyễn Thái Ngọc Duy1-4/+28
2012-03-26teach "git branch" a --quiet optionJeff King1-6/+10
2012-03-26checkout: suppress tracking message with "-q"Jeff King1-1/+1
2012-03-04Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano1-0/+4
2012-02-27branch: don't assume the merge filter ref existsCarlos Martín Nieto1-0/+4
2012-02-05branch --edit-description: protect against mistyped branch nameJunio C Hamano1-0/+15
2011-12-28Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano1-2/+9
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano1-8/+6
2011-12-13Merge branch 'jn/branch-move-to-self'Junio C Hamano1-2/+9
2011-12-13Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy1-1/+1
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy1-7/+5
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-4/+6
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano1-3/+55
2011-12-05Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy1-1/+4
2011-11-28Allow checkout -B <current-branch> to update the current branchJonathan Nieder1-1/+1
2011-11-28branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder1-1/+8
2011-11-23builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn1-2/+2
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy1-3/+2
2011-11-02branch -m: handle no arg properlyTay Ray Chuan1-5/+8
2011-10-05branch: teach --edit-description optionJunio C Hamano1-2/+54
2011-10-05Merge branch 'mg/branch-list'Junio C Hamano1-11/+34
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano1-1/+1
2011-09-16branch --set-upstream: regression fixJunio C Hamano1-1/+1
2011-09-08branch: -v does not automatically imply --listMichael J Gruber1-2/+1
2011-08-28branch: allow pattern argumentsMichael J Gruber1-3/+21
2011-08-28branch: introduce --list optionMichael J Gruber1-3/+9
2011-08-28git-branch: introduce missing long forms for the optionsMichael J Gruber1-5/+5
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano1-5/+1
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-5/+2
2011-08-22Prevent force-updating of the current branchConrad Irwin1-5/+1
2011-08-19want_color: automatically fallback to color.uiJeff King1-3/+0
2011-08-19color: delay auto-color decision until point of useJeff King1-1/+1
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingJeff King1-1/+1
2011-07-01branch -v: honor core.abbrevNamhyung Kim1-1/+4
2011-06-29Merge branch 'maint-1.7.5' into maintJunio C Hamano1-1/+1
2011-06-29"branch -d" can remove more than one branchesJunio C Hamano1-1/+1
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano1-3/+1
2011-05-26pretty: add pp_commit_easy function for simple callersJeff King1-3/+1
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano1-34/+35
2011-03-16branch: split off function that writes tracking info and commit subjectJonathan Nieder1-21/+27
2011-03-09i18n: git-branch "(no branch)" messageÆvar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-branch "git branch -v" messagesÆvar Arnfjörð Bjarmason1-3/+3
2011-03-09i18n: git-branch "Deleted branch [...]" messageÆvar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-branch "remote branch '%s' not found" messageÆvar Arnfjörð Bjarmason1-1/+2
2011-03-09i18n: git-branch basic messagesÆvar Arnfjörð Bjarmason1-28/+28
2011-02-27branch_merged: fix grammar in warningEric Hanchrow1-1/+1
2010-12-19builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina1-6/+1
2010-12-12Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano1-0/+3
2010-11-15branch: improve --verbose descriptionRené Scharfe1-1/+2
2010-11-15add OPT__FORCERené Scharfe1-1/+1
2010-11-15add description parameter to OPT__VERBOSERené Scharfe1-1/+1
2010-10-22branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy1-0/+3
2010-06-21Merge branch 'sm/branch-broken-ref'Junio C Hamano1-6/+22
2010-06-07branch: don't fail listing branches if one of the commits wasn't foundSimo Melenius1-1/+4
2010-06-07branch: exit status now reflects if branch listing finds an errorSimo Melenius1-6/+19
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-2/+2
2010-03-10Merge branch 'lt/deepen-builtin-source'Junio C Hamano1-0/+696
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+696