2
어젯밤에 정확하게 입력 한 것을 잊어 버렸지 만 git 명령을 잘못 입력 한 것을 기억하고 뭔가 엉망이되었는지 궁금합니다. 나는 모든 것이 잘되고, 커밋을 한 다음, 잠들었다고 생각했습니다. 이제어떻게 내 Repo 자체의 재귀 복사본을 만들었습니까?
오늘, 나는 git status 나는 등
new file: MyProject/MyProject/
new file: MyProject/MyProject/MyProject/
new file: MyProject/MyProject/MyProject/MyProject/
와의 100 개 + 라인을 얻을. 모든 디렉토리에는 모든 코드와 리소스의 복사본이 있습니다. git checkout -- .이 문제가 해결되지 않았습니다. 마지막 커밋에서 모든 변경 사항을 기억하기 때문에 이전 커밋으로 리베이스 할 수 있지만, 어떻게 이런 혼란을 야기했는지 알고 싶습니다.
도대체 내가 무엇을했고 어떻게 해결할 수 있습니까?
커밋 내 : 는 82a828d4bcdb74248f2183e4092974399ecfb4d2 저자 커밋 : ----- --- 날짜 : 수요일 8월 28일 20시 3분 2초 2013 -0400
Added background(s) to table view
diff --git a/Spots.xcodeproj/.LSOverride b/Spots.xcodeproj/.LSOverride
new file mode 100644
index 0000000..5d27049
Binary files /dev/null and b/Spots.xcodeproj/.LSOverride differ
diff --git a/Spots.xcodeproj/project.pbxproj b/Spots.xcodeproj/project.pbxproj
index 4ccff74..164b0b2 100644
--- a/Spots.xcodeproj/project.pbxproj
+++ b/Spots.xcodeproj/project.pbxproj
@@ -11,6 +11,18 @@
943BDCB217C96F8900923C1C /* SpotViewController.m in Sources */ =
943BEE6017A5DBBB00E16CDE /* ECSlidingViewController.m in Sources
943BEE6117A5DBBB00E16CDE /* UIImage+ImageWithUIView.m in Sources
+ 944DDFC517CEC0BF00F12B42 /* [email protected] in Resources */
+ 944DDFC617CEC0BF00F12B42 /* wood_pattern.png in Resources */ = {
+ 944DDFCD17CEC53C00F12B42 /* [email protected] in Resources */ =
+ 944DDFCE17CEC53C00F12B42 /* purty_wood.png in Resources */ = {is
+ 944DDFCF17CEC53C00F12B42 /* [email protected] in Resources */
+ 944DDFD017CEC53C00F12B42 /* retina_wood.png in Resources */ = {i
+ 944DDFD117CEC53C00F12B42 /* [email protected] in Resources */ = {is
+ 944DDFD217CEC53C00F12B42 /* wood_1.png in Resources */ = {isa =
+ 944DDFD717CEC5F600F12B42 /* [email protected] in Resources *
+ 944DDFD817CEC5F600F12B42 /* concrete_wall.png in Resources */ =
+ 944DDFD917CEC5F600F12B42 /* [email protected] in Resources */ = {isa
+ 944DDFDA17CEC5F600F12B42 /* noisy.png in Resources */ = {isa = P
94779A5717B43D5600D209A3 /* AddViewController.m in Sources */ =
94779A5E17B44DFC00D209A3 /* Notes.txt in Resources */ = {isa = P
94B794CA17CC3FDE003CA531 /* placeholder.png in Resources */ = {i
@@ -64,11 +76,23 @@
943BEE5D17A5DBBB00E16CDE /* ECSlidingViewController.m */ = {isa
943BEE5E17A5DBBB00E16CDE /* UIImage+ImageWithUIView.h */ = {isa
943BEE5F17A5DBBB00E16CDE /* UIImage+ImageWithUIView.m */ = {isa
+ 944DDFC317CEC0BF00F12B42 /* [email protected] */ = {isa = PBX
+ 944DDFC417CEC0BF00F12B42 /* wood_pattern.png */ = {isa = PBXFile
+ 944DDFC717CEC53C00F12B42 /* [email protected] */ = {isa = PBXFi
+ 944DDFC817CEC53C00F12B42 /* purty_wood.png */ = {isa = PBXFileRe
+ 944DDFC917CEC53C00F12B42 /* [email protected] */ = {isa = PBXF
+ 944DDFCA17CEC53C00F12B42 /* retina_wood.png */ = {isa = PBXFileR
+ 944DDFCB17CEC53C00F12B42 /* [email protected] */ = {isa = PBXFileRe
+ 944DDFCC17CEC53C00F12B42 /* wood_1.png */ = {isa = PBXFileRefere
+ 944DDFD317CEC5F600F12B42 /* [email protected] */ = {isa = PB
+ 944DDFD417CEC5F600F12B42 /* concrete_wall.png */ = {isa = PBXFil
+ 944DDFD517CEC5F600F12B42 /* [email protected] */ = {isa = PBXFileRef
+ 944DDFD617CEC5F600F12B42 /* noisy.png */ = {isa = PBXFileReferen
94779A5517B43D5600D209A3 /* AddViewController.h */ = {isa = PBXF
94779A5617B43D5600D209A3 /* AddViewController.m */ = {isa = PBXF
94779A5D17B44DFC00D209A3 /* Notes.txt */ = {isa = PBXFileReferen
- 94B794C817CC3FDE003CA531 /* placeholder.png */ = {isa = PBXFileR
- 94B794C917CC3FDE003CA531 /* [email protected] */ = {isa = PBXFi
+ 94B794C817CC3FDE003CA531 /* placeholder.png */ = {isa = PBXFileR
+ 94B794C917CC3FDE003CA531 /* [email protected] */ = {isa = PBXFi
94D27623179C790F0061E55E /* Spots.app */ = {isa = PBXFileReferen
94D27626179C790F0061E55E /* UIKit.framework */ = {isa = PBXFileR
94D27628179C790F0061E55E /* Foundation.framework */ = {isa = PBX
@@ -373,6 +397,18 @@
D3BC34E617B993770026A32E /* Graphics */ = {
isa = PBXGroup;
children = (
+ 944DDFD317CEC5F600F12B42 /* [email protected]
+ 944DDFD417CEC5F600F12B42 /* concrete_wall.png */
+ 944DDFD517CEC5F600F12B42 /* [email protected] */,
+ 944DDFD617CEC5F600F12B42 /* noisy.png */,
+ 944DDFC717CEC53C00F12B42 /* [email protected] *
+ 944DDFC817CEC53C00F12B42 /* purty_wood.png */,
+ 944DDFC917CEC53C00F12B42 /* [email protected]
+ 944DDFCA17CEC53C00F12B42 /* retina_wood.png */,
+ 944DDFCB17CEC53C00F12B42 /* [email protected] */,
+ 944DDFCC17CEC53C00F12B42 /* wood_1.png */,
+ 944DDFC317CEC0BF00F12B42 /* [email protected]
+ 944DDFC417CEC0BF00F12B42 /* wood_pattern.png */,
94B794C817CC3FDE003CA531 /* placeholder.png */,
94B794C917CC3FDE003CA531 /* [email protected] *
D3E43F1D17B9CEE400736C51 /* leftArrow.png */,
@@ -442,6 +478,18 @@
D3E43F2017B9CEE400736C51 /* [email protected] in
94B794CA17CC3FDE003CA531 /* placeholder.png in R
94B794CB17CC3FDE003CA531 /* [email protected] i
+ 944DDFC517CEC0BF00F12B42 /* [email protected]
+ 944DDFC617CEC0BF00F12B42 /* wood_pattern.png in
+ 944DDFCD17CEC53C00F12B42 /* [email protected] i
+ 944DDFCE17CEC53C00F12B42 /* purty_wood.png in Re
+ 944DDFCF17CEC53C00F12B42 /* [email protected]
+ 944DDFD017CEC53C00F12B42 /* retina_wood.png in R
+ 944DDFD117CEC53C00F12B42 /* [email protected] in Re
+ 944DDFD217CEC53C00F12B42 /* wood_1.png in Resour
+ 944DDFD717CEC5F600F12B42 /* [email protected]
+ 944DDFD817CEC5F600F12B42 /* concrete_wall.png in
+ 944DDFD917CEC5F600F12B42 /* [email protected] in Res
+ 944DDFDA17CEC5F600F12B42 /* noisy.png in Resourc
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Spots/Graphics/concrete_wall.png b/Spots/Graphics/concrete_wall.png
new file mode 100644
index 0000000..2de2c96
Binary files /dev/null and b/Spots/Graphics/concrete_wall.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/concrete_wall
new file mode 100644
index 0000000..a1241e1
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/noisy.png b/Spots/Graphics/noisy.png
new file mode 100644
index 0000000..8aa2f7a
Binary files /dev/null and b/Spots/Graphics/noisy.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..0dbdcdd
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/placeholder.png b/Spots/Graphics/placeholder.png
new file mode 100644
index 0000000..a081ba6
Binary files /dev/null and b/Spots/Graphics/placeholder.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..f4ffb48
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/purty_wood.png b/Spots/Graphics/purty_wood.png
new file mode 100644
index 0000000..37fcd07
Binary files /dev/null and b/Spots/Graphics/purty_wood.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..943c83c
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/retina_wood.png b/Spots/Graphics/retina_wood.png
new file mode 100644
index 0000000..22f2450
Binary files /dev/null and b/Spots/Graphics/retina_wood.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..83f2ceb
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/wood_1.png b/Spots/Graphics/wood_1.png
new file mode 100644
index 0000000..d2e51e0
Binary files /dev/null and b/Spots/Graphics/wood_1.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..d1fa60d
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/Graphics/wood_pattern.png b/Spots/Graphics/wood_pattern.png
new file mode 100644
index 0000000..fcc321d
Binary files /dev/null and b/Spots/Graphics/wood_pattern.png differ
diff --git a/Spots/Graphics/[email protected] b/Spots/Graphics/[email protected]
new file mode 100644
index 0000000..4c807e1
Binary files /dev/null and b/Spots/Graphics/[email protected] differ
diff --git a/Spots/NearbyTableViewController.m b/Spots/NearbyTableViewController
index 7224b0c..e80eeb2 100644
--- a/Spots/NearbyTableViewController.m
+++ b/Spots/NearbyTableViewController.m
@@ -52,9 +52,12 @@ static NSString* const kBCURL = @"xxx.xxxxxxxxx.xxx/xxxxxx.xxx";
self.refreshControl = refreshControl;
self.tableView.rowHeight = 180.0;
- self.tableView.backgroundColor = [UIColor colorWithRed:0.2 green:0.2 blue:0
self.tableView.scrollsToTop = YES;
- self.tableView.separatorColor = [UIColor clearColor];
+
+ UIView *patternView = [[UIView alloc] initWithFrame:self.tableView.frame];
+ patternView.backgroundColor = [UIColor colorWithPatternImage:[UIImage image
+ patternView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAuto
+ self.tableView.backgroundView = patternView;
if (!self.spotDictionary)
{
diff --git a/Spots/placeholder.png b/Spots/placeholder.png
deleted file mode 100644
index a081ba6..0000000
Binary files a/Spots/placeholder.png and /dev/null differ
diff --git a/Spots/[email protected] b/Spots/[email protected]
deleted file mode 100644
index f4ffb48..0000000
Binary files a/Spots/[email protected] and /dev/null differ
꽤 무해한 것으로 보인다.
셸에 기록 기능이있어서 수행 한 작업을 찾을 수 있습니까? 프로젝트 자체가 서브 모듈로 있습니까? 그게 가능한가? –
그래, 나는 지금 역사를보고있다. 내가 망칠 수있는'mv' 명령이 있지만 이것을하기 전에 완료된 것처럼 보입니다. 서브 모듈로 자신을 갖는 것이 의미가 있지만 ... 나는 잠자는 동안 악의적 인 자식인가? – user
업데이트 : 커밋 한 건 재실행되었습니다. 모든 것이 정상으로 돌아 왔지만 그런 종류의 혼란이 그렇게 미묘하게 일어날 수있는 것은 여전히 매우 궁금합니다. 이것이 잠시 동안 눈치 채지 못했다면 F'ing BS의 부하가 될 수있었습니다. – user