summaryrefslogtreecommitdiff
path: root/branch.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | Show interpreted branch name in error messagesConrad Irwin2011-08-221-1/+1
| * | Prevent force-updating of the current branchConrad Irwin2011-08-221-10/+24
| |/
* | branch.c: use the parsed branch nameMichael J Gruber2011-08-191-1/+1
|/
* Merge branch 'jh/maint-do-not-track-non-branches'Junio C Hamano2011-03-151-3/+8
|\
| * branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-161-3/+8
* | Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-0/+1
|/
* builtin/checkout: handle -B from detached HEAD correctlyTay Ray Chuan2010-08-091-1/+1
* Merge branch 'rc/maint-reflog-msg-for-forced-branch'Junio C Hamano2010-04-091-1/+1
* branch: warn and refuse to set a branch as a tracking branch of itself.Matthieu Moy2010-01-181-2/+12
* Add branch --set-upstreamIlari Liusvaara2010-01-181-10/+21
* Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-2/+2
* strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano2009-03-221-4/+1
* strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-221-6/+1
* Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-1/+1
* Improve "git branch --tracking" outputJunio C Hamano2009-03-101-6/+17
* Make git-clone respect branch.autosetuprebaseJunio C Hamano2009-03-031-16/+33
* Teach the "@{-1} syntax to "git branch"Junio C Hamano2009-02-131-5/+14
* Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-211-1/+3
|\
| * Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano2008-10-171-1/+3
* | builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-031-0/+1
|/
* Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-131-1/+1
* Allow tracking branches to set up rebase by default.Dustin Sallings2008-05-111-1/+21
* branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-191-20/+24
* Move code to clean up after a branch change to branch.cDaniel Barkalow2008-02-091-0/+8
* Move create_branch into a library fileDaniel Barkalow2008-02-091-0/+140
View Lorry Controller Status