Skip to content
Open

B4 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
9fa7c29
fake commit-ticketID
sohansatpute Oct 20, 2022
8376b0e
first commit
sohansatpute Oct 25, 2022
6e852c0
Merge pull request #1 from ygminds73/b1
ygminds73 Oct 25, 2022
fddbb73
this change is for req- REQ660982
sohansatpute Oct 27, 2022
87fd07e
Merge pull request #2 from ygminds73/new
ygminds73 Oct 27, 2022
bedea44
this is my last commit
Oct 27, 2022
5f49d89
Update Script12.sh
ygminds73 Dec 29, 2022
6ed411c
I have changed 2 script- script1 & Script2
sohansatpute Dec 30, 2022
a85657f
Update Script1.sh
ygminds73 Jan 2, 2023
8e86590
Update Script1.sh
ygminds73 Jan 2, 2023
c7c974d
Merge pull request #18 from ygminds73/batch-21
ygminds73 Jan 2, 2023
50f4afd
Merge branch 'main' into batch-20
ygminds73 Jan 2, 2023
aaaca80
Merge pull request #19 from ygminds73/batch-20
ygminds73 Jan 2, 2023
a7ab09c
This changes are for user request-REQ583298
sohansatpute Jan 3, 2023
e4f9a16
Merge pull request #21 from ygminds73/REQ583298
ygminds73 Jan 3, 2023
e76d21c
This is for fix - Incident ID
Jan 5, 2023
af9b7ed
Update Script12.sh
ygminds73 Jan 11, 2023
3522907
Update Script12.sh
ygminds73 Jan 11, 2023
199edbf
Update Script13.sh
ygminds73 Jan 11, 2023
efa99be
This is my first commit
sohansatpute Mar 2, 2023
374d03f
This is my 2nd commit
sohansatpute Mar 2, 2023
93508e0
This is my todays first commit
Mar 3, 2023
1fc77b1
Update Script1.sh
ygminds73 Mar 3, 2023
0600338
Merge pull request #44 from ygminds73/aws
ygminds73 Mar 3, 2023
f83565f
We did few changes in test branch
sohansatpute Mar 7, 2023
03f4d9a
This is another commit
sohansatpute Mar 7, 2023
718c06d
Merge branch 'main' into test
ygminds73 Mar 7, 2023
5c8152a
Merge pull request #50 from ygminds73/test
ygminds73 Mar 7, 2023
247a1cf
This is my first commit
sohansatpute May 1, 2023
e7d8855
This is my 2nd commit
sohansatpute May 1, 2023
c8a72e5
this is my 3rd commit
May 1, 2023
5f8f702
Update Script1.sh
ygminds73 May 2, 2023
36e9a10
Merge pull request #74 from ygminds73/batch-18
ygminds73 May 2, 2023
050da8b
Update Script11.sh
ygminds73 May 2, 2023
b3d85c9
Merge pull request #75 from ygminds73/mybranchgit
ygminds73 May 2, 2023
d69e7eb
Update Script1.sh
ygminds73 May 2, 2023
b0c900a
Update Script1.sh
ygminds73 May 2, 2023
7a7d9fc
Merge pull request #76 from ygminds73/mybranchgit
ygminds73 May 2, 2023
e959ce0
Update Script1.sh
ygminds73 May 2, 2023
c02181d
Merge pull request #77 from ygminds73/mybranchgit
ygminds73 May 2, 2023
5dfd283
new branch commit
sohansatpute May 2, 2023
8fad04d
Merge pull request #78 from ygminds73/may
ygminds73 May 2, 2023
1d1ed7d
Update Script1.sh
ygminds73 May 3, 2023
c18078c
Update Script1.sh
ygminds73 May 3, 2023
7436e3e
Merge pull request #82 from ygminds73/dev-2
ygminds73 May 3, 2023
0277c1f
Merge branch 'main' into dev-1
ygminds73 May 3, 2023
75f85cc
Merge pull request #83 from ygminds73/dev-1
ygminds73 May 3, 2023
41409c9
adding
sohansatpute May 3, 2023
a05aac5
Update Script1.sh
ygminds73 May 7, 2023
aa051ac
Update Script1.sh
ygminds73 May 7, 2023
f4f2156
This is my commit
sohansatpute Jul 12, 2023
c45c9b0
Update Script1.sh
ygminds73 Jul 13, 2023
b07385d
Merge pull request #113 from ygminds73/yg-batch-19
ygminds73 Jul 13, 2023
de2c933
Update Script1.sh
ygminds73 Jul 13, 2023
a666719
Update Script1.sh
ygminds73 Jul 13, 2023
fe1a81c
Update Script1.sh
ygminds73 Jul 13, 2023
8288fa8
Merge pull request #114 from ygminds73/aws-devops-1
ygminds73 Jul 13, 2023
706282f
Merge branch 'main' into aws-devops-2
ygminds73 Jul 13, 2023
580df6b
Merge pull request #115 from ygminds73/aws-devops-2
ygminds73 Jul 13, 2023
d2777dc
testing
Jul 14, 2023
0efc2b5
This is my fist commit for batch-20
sohansatpute Sep 15, 2023
12c0864
THis is my 2nd commit
sohansatpute Sep 15, 2023
d74b9b5
I am commiting this change in feature branch
sohansatpute Sep 16, 2023
4b828f3
Merge pull request #172 from ygminds73/feature-1
ygminds73 Sep 16, 2023
ee1ec8b
Fix for ticket INC007896
sohansatpute Sep 16, 2023
5c56b4b
Merge pull request #173 from ygminds73/INC0007896
ygminds73 Sep 16, 2023
4f03349
I am trying to create merge conflict
sohansatpute Sep 16, 2023
b99b225
Merge pull request #174 from ygminds73/INC0007896
ygminds73 Sep 16, 2023
bb6246d
Committing this change for merge conflict
sohansatpute Sep 16, 2023
2e4816e
Merge pull request #175 from ygminds73/feature-2
ygminds73 Sep 16, 2023
13afd1c
Update Script1.sh
ygminds73 Sep 16, 2023
4571a7b
Merge pull request #176 from ygminds73/feature-3
ygminds73 Sep 16, 2023
4801d32
Update Script1.sh
ygminds73 Sep 16, 2023
aac571f
Merge branch 'main' into feature-2
ygminds73 Sep 16, 2023
738bbdf
Merge pull request #177 from ygminds73/feature-2
ygminds73 Sep 16, 2023
1804762
Update Script1.sh
ygminds73 Sep 16, 2023
14a5714
Update Script1.sh
ygminds73 Sep 16, 2023
43eb8ac
Merge pull request #178 from ygminds73/hotfix-1
ygminds73 Sep 16, 2023
e4e05dc
Merge branch 'main' into hotfix-2
ygminds73 Sep 16, 2023
b6f946f
Merge pull request #179 from ygminds73/hotfix-2
ygminds73 Sep 16, 2023
9ea1172
Deleted 2 lines
Sep 18, 2023
9462321
Update Script1.sh
ygminds73 Sep 22, 2023
feb0344
Update Script1.sh
ygminds73 Nov 18, 2023
1c82999
i am commiting this change as sample
sohansatpute Nov 18, 2023
df321a9
Removed fake commits
Nov 18, 2023
7fc5b3f
We are learning git merge
sohansatpute Nov 19, 2023
53f56a2
Merge pull request #207 from ygminds73/REQ0044435
ygminds73 Nov 19, 2023
29141b7
Update Script1.sh
ygminds73 Nov 22, 2023
98a77b2
this is my first commit
sohansatpute Jan 24, 2024
fe5ba34
This is my sample commit 2nd
sohansatpute Jan 24, 2024
cb6b94d
Modifying Script2
sohansatpute Jan 24, 2024
ac03604
Request commit
sohansatpute Jan 24, 2024
da2ea2d
Merge pull request #250 from ygminds73/REQ092348
ygminds73 Jan 24, 2024
051ec25
Update Script1.sh
ygminds73 Jan 26, 2024
d8c8353
Adding code
Jan 26, 2024
c53dd8a
This is my first commit for batch-23
sohansatpute Mar 29, 2024
20526d5
2nd commit for batch-23
Mar 29, 2024
fd0cefe
Update Script1.sh
ygminds73 Mar 29, 2024
166ad0c
Update Script1.sh
ygminds73 Mar 30, 2024
2fbd565
Merge pull request #275 from ygminds73/batch-23
ygminds73 Mar 30, 2024
e427931
code changes for req- REQ9865634
sohansatpute Mar 30, 2024
115c17b
Merge pull request #276 from ygminds73/REQ9865634
ygminds73 Mar 30, 2024
11bb864
We have deleted 1 script file
sohansatpute Mar 30, 2024
9108f6a
Merge pull request #277 from ygminds73/delete
ygminds73 Mar 30, 2024
f1e4b39
Create script1.sh
ygminds73 Mar 30, 2024
1f406d0
Delete echo "We are trying this practical from linux EC2" echo "We ar…
ygminds73 Mar 30, 2024
89b1abb
Create script1.sh
ygminds73 Mar 30, 2024
4f047ad
Update script1.sh
ygminds73 Mar 30, 2024
58d77b0
this is my first commit
Mar 31, 2024
74ffee0
this is prem dhillon
Mar 31, 2024
a27ea6a
Merge pull request #3 from sardarji35/prem
sardarji35 Mar 31, 2024
c4371bd
Create file1
sardarji35 Apr 1, 2024
d858c09
Update file1
sardarji35 Apr 1, 2024
87368e3
Update file1
sardarji35 Apr 1, 2024
1cc87d7
Merge pull request #4 from sardarji35/b3
sardarji35 Apr 1, 2024
039423c
Merge branch 'main' into b1
sardarji35 Apr 1, 2024
b2d9002
Merge pull request #5 from sardarji35/b1
sardarji35 Apr 1, 2024
abc088c
this is my first commit
Mar 4, 2025
efd6488
this is my 2nd commit
Mar 4, 2025
6bca569
Update script1.sh
sardarji35 Mar 5, 2025
d8d5a72
Merge pull request #6 from sardarji35/testing-new-branch
sardarji35 Mar 5, 2025
9f4a547
this is code changes fro REQ123456
Mar 5, 2025
0fefba9
Merge pull request #7 from sardarji35/REQ123456
sardarji35 Mar 5, 2025
8c91236
Please enter the commit message for your changes. Lines starting
Mar 5, 2025
764a44c
add comment for new branch
Mar 5, 2025
3293d3b
Merge pull request #8 from sardarji35/newbranch
sardarji35 Mar 5, 2025
4c2d620
Create file2
sardarji35 Mar 6, 2025
e530979
Update file2
sardarji35 Mar 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Script1.sh

This file was deleted.

2 changes: 2 additions & 0 deletions Script11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ then
else
echo "None of the condition met"
fi

echo "I have changed this branch"
24 changes: 2 additions & 22 deletions Script12.sh
Original file line number Diff line number Diff line change
@@ -1,40 +1,20 @@
#!/bin/bash
#this script is for if-elif-fi
echo "Please enter value of a"
read a
echo "Please enter vaule of b"
read b
if [ $a == $b ]
then
echo "a is equal to b"
elif [ $a -gt $b ]
then
echo "a is greater than b"
elif [ $a -lt $b ]
then
echo "a is less than b"
else
echo "None of the condition met"
fi
root@ip-172-31-42-137:~/scripts/shellscripts# ^C
root@ip-172-31-42-137:~/scripts/shellscripts# cat script12.sh
#!/bin/sh
a="abc"
b="efg"

if [ $a = $b ]
then
echo "$a = $b : a is equal to b"
else
echo "$a = $b: a is not equal to b"
echo "$a != $b: a is not equal to b"
fi


if [ $a != $b ]
then
echo "$a != $b : a is not equal to b"
else
echo "$a != $b: a is equal to b"
echo "$a = $b: a is equal to b"
fi


Expand Down
2 changes: 1 addition & 1 deletion Script13.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ $a != $b ]
then
echo "$a != $b : a is not equal to b"
else
echo "$a != $b: a is equal to b"
echo "$a = $b: a is equal to b"
fi

if [ $a -lt 100 -a $b -gt 15 ]
Expand Down
1 change: 1 addition & 0 deletions Script19.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
new script
2 changes: 1 addition & 1 deletion Script2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ read a
echo "Value of b"
read b
echo "Hello value of a is $a and value of b is $b"
echo "This is sample change"
echo "Welcome to DevOps"
1 change: 1 addition & 0 deletions Script8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ then
else
echo "None of the condition met"
fi

1 change: 1 addition & 0 deletions Scrpit10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ then
echo "a is greater than b"
else
echo "a is smaller than b"
echo " but a is happy than b"
fi
4 changes: 4 additions & 0 deletions file1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1. hi
2. good morning
3. how are you?
4. husband; we have to travel pune in dec
5 changes: 5 additions & 0 deletions file2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
hi
good morning
how are you
we have to travel
GOA in Dec
10 changes: 10 additions & 0 deletions script1.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
echo "We are trying this practical from linux EC2"
echo "We are from batch-24 and learning git/gihub"
echo "Happy weekend"
echo "we are testing-git in lecture 59"
echo "wer are doing mofify"
echo "we are adding new line"
echo "we are add 3 line"
echo "todya is saturday"
echo "we are adding this line when we are learning branch"
echo "ading new line"