]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mg/tracked-local-branches'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:31 +0000 (00:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:31 +0000 (00:42 -0700)
* mg/tracked-local-branches:
  Make local branches behave like remote branches when --tracked
  Test for local branches being followed with --track

1  2 
remote.c

diff --cc remote.c
Simple merge