summaryrefslogtreecommitdiff
path: root/builtin/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/branch-unborn-in-other-worktrees'Junio C Hamano2023-05-151-13/+58
|\
| * branch: avoid unnecessary worktrees traversalsRubén Justo2023-03-271-1/+1
| * branch: rename orphan branches in any worktreeRubén Justo2023-03-271-2/+4
| * branch: description for orphan branch errorsRubén Justo2023-03-271-5/+16
| * branch: use get_worktrees() in copy_or_rename_branch()Rubén Justo2023-03-271-9/+9
| * branch: test for failures while renaming branchesRubén Justo2023-03-271-0/+32
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+2
|\ \
| * | editor: move editor-related functions and declarations into common fileElijah Newren2023-04-111-0/+1
| * | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-4/+5
| |\ \
* | \ \ Merge branch 'ow/ref-filter-omit-empty'Junio C Hamano2023-04-211-1/+5
|\ \ \ \
| * | | | branch, for-each-ref, tag: add option to omit empty linesØystein Walle2023-04-131-1/+5
| | |_|/ | |/| |
* | | | Merge branch 'cm/branch-delete-error-message-update'Junio C Hamano2023-04-171-4/+21
|\ \ \ \
| * | | | branch: improve error log on branch not found by checking remotes refsClement Mabileau2023-04-061-4/+21
| |/ / /
* | | | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | | environment: move comment_line_char from cache.hElijah Newren2023-03-211-0/+1
| * | | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
| |/ /
* | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-4/+5
|\ \ \ | | |/ | |/|
| * | post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason2023-03-281-1/+1
| * | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| |/
* | for-each-ref: add ahead-behind format atomDerrick Stolee2023-03-201-0/+1
|/
* Merge branch 'rj/branch-copy-and-rename'Junio C Hamano2022-12-191-3/+3
|\
| * branch: force-copy a branch to itself via @{-1} is a no-opRubén Justo2022-11-171-3/+3
* | 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /