]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f35bb7c 21b5b1e)
Merge branch 'jh/maint-do-not-track-non-branches' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:45 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:45 +0000 (16:20 -0700)
* jh/maint-do-not-track-non-branches:
  branch/checkout --track: Ensure that upstream branch is indeed a branch

1  2 
t/t3200-branch.sh patch | diff1 | diff2 | blob | history
t/t6040-tracking-info.sh patch | diff1 | diff2 | blob | history

diff --cc t/t3200-branch.sh
Simple merge
diff --cc t/t6040-tracking-info.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.