summaryrefslogtreecommitdiff
path: root/branch.c
AgeCommit message (Expand)AuthorFilesLines
2013-10-23Merge branch 'jh/checkout-auto-tracking' into maintLibravatar Junio C Hamano1-2/+1
2013-09-09branch.c: Relax unnecessary requirement on upstream's remote ref nameLibravatar Per Cederqvist1-2/+1
2013-05-29Merge branch 'jh/checkout-auto-tracking'Libravatar Junio C Hamano1-1/+16
2013-04-21branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Libravatar Johan Herland1-1/+16
2013-04-15i18n: branch: mark strings for translationLibravatar Jiang Xin1-27/+27
2013-04-02branch: give advice when tracking start-point is missingLibravatar Jeff King1-2/+17
2013-04-02branch: mention start_name in set-upstream error messagesLibravatar Jeff King1-5/+5
2013-04-02branch: improve error message for missing --set-upstream-to refLibravatar Jeff King1-1/+6
2013-04-02branch: factor out "upstream is not a branch" error messagesLibravatar Jeff King1-2/+5
2012-06-07Remove i18n legos in notifying new branch tracking setupLibravatar Nguyễn Thái Ngọc Duy1-15/+23
2012-03-26checkout: suppress tracking message with "-q"Libravatar Jeff King1-4/+5
2011-12-19Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-1/+1
2011-12-19Merge branch 'jn/maint-sequencer-fixes'Libravatar Junio C Hamano1-2/+0
2011-12-13Merge branch 'jn/branch-move-to-self'Libravatar Junio C Hamano1-2/+4
2011-12-13Rename resolve_ref() to resolve_ref_unsafe()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-12-12Revert "reset: Make reset remove the sequencer state"Libravatar Jonathan Nieder1-2/+0
2011-12-09Merge branch 'jc/request-pull-show-head-4'Libravatar Junio C Hamano1-0/+31
2011-11-28Allow checkout -B <current-branch> to update the current branchLibravatar Jonathan Nieder1-2/+4
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertLibravatar Jonathan Nieder1-0/+1
2011-10-05branch: add read_branch_desc() helper functionLibravatar Junio C Hamano1-0/+31
2011-10-05Merge branch 'rr/revert-cherry-pick-continue'Libravatar Junio C Hamano1-0/+2
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-9/+12
2011-09-16branch --set-upstream: regression fixLibravatar Junio C Hamano1-9/+12
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-10/+24
2011-08-22Show interpreted branch name in error messagesLibravatar Conrad Irwin1-1/+1
2011-08-22Prevent force-updating of the current branchLibravatar Conrad Irwin1-10/+24
2011-08-19branch.c: use the parsed branch nameLibravatar Michael J Gruber1-1/+1
2011-08-08reset: Make reset remove the sequencer stateLibravatar Ramkumar Ramachandra1-0/+2
2011-03-15Merge branch 'jh/maint-do-not-track-non-branches'Libravatar Junio C Hamano1-3/+8
2011-02-21Introduce CHERRY_PICK_HEADLibravatar Jay Soffian1-0/+1
2011-02-16branch/checkout --track: Ensure that upstream branch is indeed a branchLibravatar Johan Herland1-3/+8
2010-08-09builtin/checkout: handle -B from detached HEAD correctlyLibravatar Tay Ray Chuan1-1/+1
2010-04-09Merge branch 'rc/maint-reflog-msg-for-forced-branch'Libravatar Junio C Hamano1-1/+1
2010-01-18branch: warn and refuse to set a branch as a tracking branch of itself.Libravatar Matthieu Moy1-2/+12
2010-01-18Add branch --set-upstreamLibravatar Ilari Liusvaara1-10/+21
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Libravatar Thomas Rast1-2/+2
2009-03-22strbuf_check_branch_ref(): a helper to check a refname for a branchLibravatar Junio C Hamano1-4/+1
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsLibravatar Junio C Hamano1-6/+1
2009-03-22Rename interpret/substitute nth_last_branch functionsLibravatar Junio C Hamano1-1/+1
2009-03-10Improve "git branch --tracking" outputLibravatar Junio C Hamano1-6/+17
2009-03-03Make git-clone respect branch.autosetuprebaseLibravatar Junio C Hamano1-16/+33
2009-02-13Teach the "@{-1} syntax to "git branch"Libravatar Junio C Hamano1-5/+14
2008-10-21Merge branch 'jc/maint-co-track'Libravatar Junio C Hamano1-1/+3
2008-10-17Fix "checkout --track -b newbranch" on detached HEADLibravatar Junio C Hamano1-1/+3
2008-10-03builtin-commit: use reduce_heads() only when appropriateLibravatar Miklos Vajna1-0/+1
2008-07-13Move MERGE_RR from .git/rr-cache/ into .git/Libravatar Johannes Schindelin1-1/+1
2008-05-11Allow tracking branches to set up rebase by default.Libravatar Dustin Sallings1-1/+21
2008-02-19branch: optionally setup branch.*.merge from upstream local branchesLibravatar Jay Soffian1-20/+24
2008-02-09Move code to clean up after a branch change to branch.cLibravatar Daniel Barkalow1-0/+8
2008-02-09Move create_branch into a library fileLibravatar Daniel Barkalow1-0/+140