Last login: Thu Jun 28 15:24:16 on ttys001
ApplematoMacBook-Pro:~ Apple$ cd /Users/Apple/Desktop/WorkSpace/shandongWlan/yhytWLAN
ApplematoMacBook-Pro:yhytWLAN Apple$ git status
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: Classes/BaseTabBarController.m
# modified: Classes/MyWiFiController.m
# modified: WLAN.xcodeproj/project.pbxproj
#
no changes added to commit (use "git add" and/or "git commit -a")
ApplematoMacBook-Pro:yhytWLAN Apple$ git add .
ApplematoMacBook-Pro:yhytWLAN Apple$ git commit
[master 413c2b1] 2012-06-28修改
3 files changed, 16 insertions(+), 10 deletions(-)
ApplematoMacBook-Pro:yhytWLAN Apple$ git branch
* master
ApplematoMacBook-Pro:yhytWLAN Apple$ git checkout -b test
Switched to a new branch 'test'
ApplematoMacBook-Pro:yhytWLAN Apple$ git pull origin master
fatal: 'git@192.168.5.76' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
ApplematoMacBook-Pro:yhytWLAN Apple$ git remote -v
origin git@192.168.5.76 (fetch)
origin git@192.168.5.76 (push)
ApplematoMacBook-Pro:yhytWLAN Apple$ git remote rm origin
ApplematoMacBook-Pro:yhytWLAN Apple$ git remote add origin git@192.168.5.76:yhytWLAN.git
ApplematoMacBook-Pro:yhytWLAN Apple$ git remote -v
origin git@192.168.5.76:yhytWLAN.git (fetch)
origin git@192.168.5.76:yhytWLAN.git (push)
ApplematoMacBook-Pro:yhytWLAN Apple$ git pull origin master
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From 192.168.5.76:yhytWLAN
* branch master -> FETCH_HEAD
Merge made by recursive.
Classes/BaseNavController.m | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
ApplematoMacBook-Pro:yhytWLAN Apple$ git diff master
diff --git a/Classes/BaseNavController.m b/Classes/BaseNavController.m
index 179fc9a..9a7b99b 100755
--- a/Classes/BaseNavController.m
+++ b/Classes/BaseNavController.m
@@ -35,8 +35,12 @@
UIImageView *imgView = [[UIImageView alloc] initWithImage:image_top];
imgView.backgroundColor = [UIColor clearColor];
CGRect rect = self.bounds;
- rect.size.height = self.bounds.size.height;
+ //****************************fuxf 2012_6_28 add start************************
+ rect.size.height = self.bounds.size.height + 4;
imgView.frame = rect;
+
+ oneObject.clipsToBounds = YES;
+ //****************************fuxf 2012_6_28 add end************************
[oneObject addSubview:imgView];
[imgView release];
break;
ApplematoMacBook-Pro:yhytWLAN Apple$ vim Classes/BaseNavController.m
ApplematoMacBook-Pro:yhytWLAN Apple$ git checkout master
Switched to branch 'master'
ApplematoMacBook-Pro:yhytWLAN Apple$ git merge test
Updating 413c2b1..62ac80f
Fast-forward
Classes/BaseNavController.m | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
ApplematoMacBook-Pro:yhytWLAN Apple$ pwd
/Users/Apple/Desktop/WorkSpace/shandongWlan/yhytWLAN
ApplematoMacBook-Pro:yhytWLAN Apple$ vim Classes/BaseNavController.m
ApplematoMacBook-Pro:yhytWLAN Apple$ git push origin master
Counting objects: 18, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (10/10), 1.14 KiB, done.
Total 10 (delta 7), reused 1 (delta 1)
To git@192.168.5.76:yhytWLAN.git
7fe8313..62ac80f master -> master
ApplematoMacBook-Pro:yhytWLAN Apple$