From 2fdb61be198a99b06e03f80f3cadb487795df46b Mon Sep 17 00:00:00 2001 From: Arvind Personal Date: Mon, 28 Mar 2016 19:58:21 +0530 Subject: [PATCH 1/9] First commit on branch. --- xxx => asdada | 0 main.cpp | 1 - quicksort.zip | Bin 2128 -> 0 bytes xyz.txt | 0 4 files changed, 1 deletion(-) rename xxx => asdada (100%) delete mode 100644 quicksort.zip create mode 100644 xyz.txt diff --git a/xxx b/asdada similarity index 100% rename from xxx rename to asdada diff --git a/main.cpp b/main.cpp index 8c358d5..1f3fedf 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/quicksort.zip b/quicksort.zip deleted file mode 100644 index beab777187866dd3efceeaafe8a9a113a85198c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2128 zcmai0dpOf=AOAIST17eL6v?Tcm`8dlhuETpupDA*F)F7RvCYDWs1~ooawxQncq|?* zL?a<w0SW{SSNFU9-|9DO&0$ebjhoh&Q^BHZvZ^D$@N??`KoXuLP*6 z8j!vg1FDJFC$l&h+0v$ zuO&EiaZgBvxw&k|_40%@XN|1?q7r4~axH71`2nO{XD992kQ|CYM|GpF7S$dW*oZ9VMz z!T&+-5>af;N=>$0_k2O4*S6bF+H}r!XO8d`SRtT1D9_Z*Xt6FROik>3Vu19!x|H9t zh38HBRU)f>R9==~VI#RmWk87d}?(HTT`s(Hc*! zMWYen)U8p&eADCE-6H+27#_+Ot%=#BsNDA&cSTv8yDT( zp=lvPDHjR?x%im)k`|KlIA$7tSWk#kL4JNgWl4Gx4|;WZvc$4lS*)6meog-DD<8Wg z`Py-{bhL`j{=^mzHx)yPE*u zq(D{RpVa5`U3--OqPaga;=86LPWw%@&+hd&VGBPX83qNvT%K|s@V41Oak8_@p9 zBV?%DBBkAV%J>Jx=5zvFQ!ZTezJOvtc*Am)fdGte;CF9*$eed66T~mxT9N9G&4S3V zs5cu44<}(T@ALT|`uREKzDZfgfbbUD|gE9g2W=uOT?jHK%dzp9pP z7NnQf)FRVIgN~FFcZs~$*U9KvGAFZlgg1IV%ZrBD!)kl2n8lNbq7p-~NI0BsnhVj{ z?`&&vWf=h7#(k)n(0|pzxHVeu_b%Se=~+rM1C+1G*_`=w*!G-<-ZT?g@(vQ_mql8; zoGt2oAn2e!w#LT~+eWX~x$$zk7^yjZK2*}G|IcoXPHKg9#r!b2?vFwitYD#`%z%;P zbE(e=EnQXiWO-iYWhv8K9}6d4;WTk#QJ^99!f)JY@f688oX@GrGX;%iX{fm!UsuJ@ zOxAAt8#zM1nsLvUR@bsZUp1zMRNp$-a1`I-_=}KW%?nPrU}gY-e*(*2y|DlQ diff --git a/xyz.txt b/xyz.txt new file mode 100644 index 0000000..e69de29 From 89cbd0f02683b8868047f50af7cd73f7268866c3 Mon Sep 17 00:00:00 2001 From: Arvind Personal Date: Wed, 30 Mar 2016 11:26:18 +0530 Subject: [PATCH 2/9] Real Feature-a line 1 --- main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.cpp b/main.cpp index 1f3fedf..9999d56 100644 --- a/main.cpp +++ b/main.cpp @@ -12,6 +12,8 @@ using namespace std; int main(int argc, char* argv[]) { +// Real feature-a line 1 + std::vector v(10); v[0]="Paris"; v[1]="London"; From 1a55177f6b0c4233db2d1b073f7ef49142074b24 Mon Sep 17 00:00:00 2001 From: Arvind Personal Date: Wed, 30 Mar 2016 11:26:34 +0530 Subject: [PATCH 3/9] Real Feature-a line 2 --- main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main.cpp b/main.cpp index 9999d56..9409461 100644 --- a/main.cpp +++ b/main.cpp @@ -13,6 +13,7 @@ using namespace std; int main(int argc, char* argv[]) { // Real feature-a line 1 +// Real feature-a line 2 std::vector v(10); v[0]="Paris"; From 0b5029235868268aa22e66fa444ae910c939612a Mon Sep 17 00:00:00 2001 From: Arvind Padmanabhan Date: Fri, 21 Oct 2016 19:17:24 +0530 Subject: [PATCH 4/9] Update abc.txt --- abc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/abc.txt b/abc.txt index e69de29..6f7a689 100644 --- a/abc.txt +++ b/abc.txt @@ -0,0 +1 @@ +Making changes in feature-a branch ... From be231d7814744d1909d8c5504a4719b87fbef880 Mon Sep 17 00:00:00 2001 From: jiraffa18ft Date: Sun, 3 Apr 2016 20:17:51 +0530 Subject: [PATCH 5/9] bugfix done --- .gitignore | 1 + main.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1944fd6..ff80741 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.tmp +myreadme.txt diff --git a/main.cpp b/main.cpp index 9409461..0e734b8 100644 --- a/main.cpp +++ b/main.cpp @@ -37,6 +37,7 @@ int main(int argc, char* argv[]) std::for_each(v.begin(), v.end(), print); std::cout<<'\n'; + // data int a[]={3,8,0,6,7,4,2,1,9,3,1,8,3,9,2,0,9}; int *a_end=a+sizeof a/sizeof(int); From 76469d310f57128238969056b6d82ff88fffb9d4 Mon Sep 17 00:00:00 2001 From: Arvind Padmanabhan Date: Fri, 21 Oct 2016 21:32:26 +0530 Subject: [PATCH 6/9] New changes on branch. --- abc.txt | 5 ++++- main.cpp | 1 + quicksort.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/abc.txt b/abc.txt index 6f7a689..5c612e1 100644 --- a/abc.txt +++ b/abc.txt @@ -1 +1,4 @@ -Making changes in feature-a branch ... +Making changes +in feature-a branch ... + +A newline diff --git a/main.cpp b/main.cpp index 0e734b8..a8a1403 100644 --- a/main.cpp +++ b/main.cpp @@ -14,6 +14,7 @@ int main(int argc, char* argv[]) { // Real feature-a line 1 // Real feature-a line 2 +// Which branch? std::vector v(10); v[0]="Paris"; diff --git a/quicksort.cpp b/quicksort.cpp index 9e1cc54..0a61acd 100644 --- a/quicksort.cpp +++ b/quicksort.cpp @@ -12,6 +12,8 @@ Retrieved from: http://en.literateprograms.org/Quicksort_(C_Plus_Plus)?oldid=109 #include "quicksort.h" +// Adding a line of comment + template IT partition(IT begin, IT end, IT pivot) { typename std::iterator_traits::value_type piv(*pivot); From 9dd08025da0499ebe0ae3899f7b438e4e69e9db7 Mon Sep 17 00:00:00 2001 From: Arvind Padmanabhan Date: Fri, 21 Oct 2016 22:16:25 +0530 Subject: [PATCH 7/9] COmmit on feature-a branch. --- abc.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/abc.txt b/abc.txt index 5c612e1..42df16c 100644 --- a/abc.txt +++ b/abc.txt @@ -2,3 +2,5 @@ Making changes in feature-a branch ... A newline + +a new line again From e23bcbde4d5283756823e431cdaa4eae55c477e8 Mon Sep 17 00:00:00 2001 From: AP Bangalore Date: Sat, 22 Oct 2016 12:19:41 +0530 Subject: [PATCH 8/9] Modified .gitignore. Added comments in main.cpp. --- .gitignore | 4 ++++ main.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index ff80741..bcf3c56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ +.vscode/ +*.o *.tmp myreadme.txt + + diff --git a/main.cpp b/main.cpp index a8a1403..32bcffe 100644 --- a/main.cpp +++ b/main.cpp @@ -10,6 +10,7 @@ using namespace std; #include "quicksort.h" +// Adding a new line int main(int argc, char* argv[]) { // Real feature-a line 1 From 5b1a77003e19c80f6ca5378236be232d3688393f Mon Sep 17 00:00:00 2001 From: AP Bangalore Date: Sat, 22 Oct 2016 12:29:41 +0530 Subject: [PATCH 9/9] Committing partially, --- main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main.cpp b/main.cpp index 32bcffe..ae5a91d 100644 --- a/main.cpp +++ b/main.cpp @@ -11,6 +11,7 @@ using namespace std; #include "quicksort.h" // Adding a new line +// This is a new line .... int main(int argc, char* argv[]) { // Real feature-a line 1