summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* branch: gracefully handle '-d' on orphan HEADJeff King2022-11-101-6/+3
* Merge branch 'rj/branch-do-not-exit-with-minus-one-status'Taylor Blau2022-10-301-1/+1
|\
| * branch: error code with --edit-descriptionRubén Justo2022-10-261-1/+1
* | branch: error copying or renaming a detached HEADRubén Justo2022-10-261-20/+8
|/
* Merge branch 'rj/branch-edit-description-with-nth-checkout'Junio C Hamano2022-10-211-19/+34
|\
| * branch: support for shortcuts like @{-1}, completedRubén Justo2022-10-101-19/+34
* | Merge branch 'rj/branch-edit-desc-unborn'Junio C Hamano2022-10-171-2/+12
|\ \
| * | branch: description for non-existent branch errorsRubén Justo2022-10-071-2/+12
| |/
* | Merge branch 'jc/branch-description-unset'Junio C Hamano2022-10-171-2/+4
|\ \ | |/ |/|
| * branch: do not fail a no-op --edit-descJunio C Hamano2022-09-301-2/+4
* | branch: drop unused worktrees variableJeff King2022-06-211-4/+0
* | branch: use branch_checked_out() when deleting refsDerrick Stolee2022-06-151-4/+3
* | Merge branch 'gc/branch-recurse-submodules'Junio C Hamano2022-02-181-19/+51
|\ \
| * | branch: add --recurse-submodules option for branch creationGlen Choo2022-02-041-6/+38
| * | builtin/branch: consolidate action-picking logic in cmd_branch()Glen Choo2022-02-011-8/+11
| * | branch: add a dry_run parameter to create_branch()Glen Choo2022-02-011-1/+1
| * | branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Glen Choo2022-02-011-6/+3
| * | Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodulesJunio C Hamano2022-01-311-2/+4
| |\ \
* | \ \ Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-201-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | branch,checkout: fix --track documentationRené Scharfe2022-01-201-1/+1
* | | | Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-181-2/+2
|\ \ \ \ | |/ / /
| * | | branch,checkout: fix --track usage stringsJosh Steadmon2022-01-181-2/+2
* | | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-1/+1
|\ \ \ \
| * | | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-1/+1
* | | | | Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-101-2/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | branch: add flags and config to inherit trackingJosh Steadmon2021-12-201-2/+4
* | | | worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg2021-12-011-1/+6
| |/ / |/| |
* | | for-each-ref: delay parsing of --sort=<atom> optionsJunio C Hamano2021-10-201-7/+6
* | | branch: use ref_sorting_release()Ævar Arnfjörð Bjarmason2021-10-201-3/+5
|/ /
* | ref-filter: stop setting FILTER_REFS_INCLUDE_BROKENJeff King2021-09-271-1/+1
* | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-271-1/+1
* | ref-filter: reuse output bufferZheNing Hu2021-04-201-4/+6
* | Merge branch 'ph/use-delete-refs'Junio C Hamano2021-02-051-19/+28
|\ \ | |/ |/|
| * use delete_refs when deleting tags or branchesPhil Hord2021-01-211-19/+28
* | branch: sort detached HEAD based on a flagÆvar Arnfjörð Bjarmason2021-01-071-0/+2
* | ref-filter: move ref_sorting flags to a bitfieldÆvar Arnfjörð Bjarmason2021-01-071-1/+1
* | branch: change "--local" to "--list" in commentÆvar Arnfjörð Bjarmason2021-01-061-1/+1
|/
* Merge branch 'js/init-defaultbranch-advice'Junio C Hamano2020-12-181-1/+3
|\
| * branch -m: allow renaming a yet-unborn branchJohannes Schindelin2020-12-131-1/+3
* | config: convert multi_replace to flagsDerrick Stolee2020-11-251-2/+2
|/
* ref-filter: allow merged and no-merged filtersAaron Lipman2020-09-161-3/+3
* Merge branch 'es/get-worktrees-unsort'Junio C Hamano2020-07-061-1/+1
|\
| * worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine2020-06-221-1/+1
* | Merge branch 'dl/branch-cleanup'Junio C Hamano2020-06-251-1/+1
|\ \
| * | branch: don't mix --edit-descriptionDenton Liu2020-06-171-1/+1
| |/
* | Merge branch 'jk/for-each-ref-multi-key-sort-fix'Junio C Hamano2020-05-081-1/+1
|\ \
| * | ref-filter: apply --ignore-case to all sorting keysJeff King2020-05-041-1/+1
* | | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-4/+2
| |/ |/|
* | l10n: minor case fix in 'git branch' '--unset-upstream' descriptionDimitriy Ryazantcev2019-12-091-1/+1
* | Merge branch 'po/doc-branch'Junio C Hamano2019-07-091-1/+2
|\ \