Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first cr #1

Open
wants to merge 10 commits into
base: br1
Choose a base branch
from
Open

first cr #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
429b7e7
new file file3
herry1234 Mar 10, 2015
fde55c3
Merge branch 'br1'
herry1234 Mar 11, 2015
b62f94e
new file file3
herry1234 Mar 10, 2015
f3bec49
testing merge
herry1234 Mar 11, 2015
8a6285a
:Merge branch 'master' of github.com:herry1234/gitdummy
herry1234 Mar 11, 2015
fcecf8e
in master
herry1234 Mar 11, 2015
1f7848d
in br2
herry1234 Mar 11, 2015
a30f202
in br2 #2
herry1234 Mar 11, 2015
fce26c3
in br2 #2
herry1234 Mar 11, 2015
d6765e1
Merge branch 'master' of github.com:herry1234/gitdummy
herry1234 May 2, 2015
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
1 change: 1 addition & 0 deletions file1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ TEST
br1: added by user2
br1: added by user1
br1: update
try amend
3 changes: 3 additions & 0 deletions file2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
rebase test
Line master
Line in br2
Line in br2
2 changes: 2 additions & 0 deletions file3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
br2
merge again