summaryrefslogtreecommitdiff
path: root/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-12/+34
|\
| * worktrees: add find_shared_symrefDavid Turner2015-08-111-12/+34
* | Merge branch 'jk/git-path'Junio C Hamano2015-08-191-7/+7
|\ \
| * | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-7/+7
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-121-0/+67
|\ \ \ | |/ / |/| / | |/
| * branch: publish die_if_checked_out()Eric Sunshine2015-07-201-0/+67
* | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-171-2/+3
|/
* refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
* refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-151-2/+2
* Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-111-14/+17
|\
| * branch.c: use ref transaction for all ref updatesRonnie Sahlberg2014-09-031-14/+17
* | branch.c: replace `git_config()` with `git_config_get_string()Tanay Abhra2014-08-071-20/+7
* | change `git_config()` return value to voidTanay Abhra2014-08-071-4/+1
* | refactor skip_prefix to return a booleanJeff King2014-06-201-2/+2
|/
* Merge branch 'an/branch-config-message'Junio C Hamano2014-03-311-23/+23
|\
| * branch.c: install_branch_config: simplify if chainan/branch-config-messageAdam2014-03-241-23/+23
* | Merge branch 'bg/install-branch-config-skip-prefix'Junio C Hamano2014-03-181-9/+9
|\ \
| * | branch: use skip_prefix() in install_branch_config()bg/install-branch-config-skip-prefixBrian Gesiak2014-03-061-9/+9
| |/
* | Merge branch 'jn/branch-lift-unnecessary-name-length-limit'Junio C Hamano2014-03-181-4/+0
|\ \ | |/ |/|
| * branch.c: delete size check of newly tracked branch namesjn/branch-lift-unnecessary-name-length-limitJacopo Notarstefano2014-03-051-4/+0
| * Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-231-2/+1
| |\
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-2/+2
* | | Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-201-1/+1
|\ \ \
| * | | refs: report ref type from lock_any_ref_for_updateBrad King2013-08-301-1/+1
| |/ /
* | | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-09-201-2/+1
|\ \ \ | | |/ | |/|
| * | branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-091-2/+1
* | | branch: trivial style fixFelipe Contreras2013-08-301-1/+1
| |/ |/|
* | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-291-1/+16
|\ \ | |/
| * branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-211-1/+16
* | i18n: branch: mark strings for translationJiang Xin2013-04-151-27/+27
|/
* branch: give advice when tracking start-point is missingJeff King2013-04-021-2/+17
* branch: mention start_name in set-upstream error messagesJeff King2013-04-021-5/+5
* branch: improve error message for missing --set-upstream-to refJeff King2013-04-021-1/+6
* branch: factor out "upstream is not a branch" error messagesJeff King2013-04-021-2/+5
* Remove i18n legos in notifying new branch tracking setupNguyễn Thái Ngọc Duy2012-06-071-15/+23
* checkout: suppress tracking message with "-q"Jeff King2012-03-261-4/+5
* Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-191-1/+1
|\
| * Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễn Thái Ngọc Duy2011-12-131-1/+1
* | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-191-2/+0
|\ \
| * | Revert "reset: Make reset remove the sequencer state"Jonathan Nieder2011-12-121-2/+0
* | | Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-131-2/+4
|\ \ \ | |_|/ |/| |
| * | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-2/+4
| |/
* | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-091-0/+31
|\ \ | |/ |/|
| * branch: add read_branch_desc() helper functionJunio C Hamano2011-10-051-0/+31
* | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+1
* | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-051-0/+2
|\ \ | |/ |/|
| * reset: Make reset remove the sequencer stateRamkumar Ramachandra2011-08-081-0/+2
* | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-161-9/+12
|\ \
| * | branch --set-upstream: regression fixJunio C Hamano2011-09-161-9/+12
* | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-281-10/+24
|\ \ \ | |/ /
View Lorry Controller Status