Skip to content

Instantly share code, notes, and snippets.

@mnaoumov
Last active December 11, 2015 08:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mnaoumov/4575495 to your computer and use it in GitHub Desktop.
Save mnaoumov/4575495 to your computer and use it in GitHub Desktop.
git log strange behavior
git log --oneline --decorate master..1.0
ec9988c (tag: build-1.3.2616.0, 1.0) Merge branch '1.0' into mobile
e29326d Merge remote-tracking branch 'origin/1.0' into 1.0
b716f00 Merge branch '1.0' into mobile
faa9bc3 TFS9437 send down correct brand id
25ae928 Fix js hint errors
aef6132 Merge branch 'mobile' of git.f-dev.net:otp into mobile
1d9691a TFS9112 Fix Bug in Mobile:Customer details- Navigation is not working on Time zone page.
50e31c3 Merge branch 'mobile' of git.f-dev.net:otp into mobile
ed14bba TFS9720 updating the vm/js tests based on a greater understanding of how the flow of this page should work
c6701f8 Merge remote-tracking branch 'origin/mobile' into mobile
7addf23 TFS8597 Added tests for broadcast message, jslint fixed extra comma within dataclient
fae044b (tag: build-1.3.2615.0) Merge branch '1.0' of 192.168.0.100:otp into 1.0
ee1fa8a Merge branch '1.0' of 192.168.0.100:otp into 1.0
d83f181 QC1824 WBC - Fix SIGN IN button on SessionTerminated page
5af7889 QC1824 WBC - Redirect to Home after MultipleSessions. Remove not needed code from RecycleActiveSessionCommandHandler
86aef75 Merge branch 'mobile' of git.f-dev.net:otp into mobile
76b43a5 TFS9720 updating js tests to account for the change
e7b6841 Merge branch '1.0' of 192.168.0.100:otp into 1.0
abe49b6 added more logging
1f6a7e9 Merge remote-tracking branch 'origin/mobile' into mobile
14566e8 TFS8597 broadcast message interupt feedback
016f1db Merge branch 'mobile' of git.f-dev.net:otp into mobile
214649d TFS9130 - Added tests for BSB warning message and fixed logic determining when the message should be displayed.
f0af24d Merge branch 'mobile' of git.f-dev.net:otp into mobile
7ce87f3 TFS9720 correctly handling the required MFA challenge. Not using the controller to do this
79f02ab Merge branch 'mobile' into 1.0
90dc5d0 TFS9130 - Mobile add payee page will now show warning if BSB bank name is not found, but not found to be invalid.
cdf1952 TFS9723 pass down image url and image available properties in the bpayview controller
f571499 Merge branch '1.0' of 192.168.0.100:otp into 1.0
77f8f92 Merge branch '1.0' of 192.168.0.100:otp into 1.0
5ef9556 Merge branch '1.0' of 192.168.0.100:otp into 1.0
3921ab1 Merge remote-tracking branch 'origin/mobile' into mobile
e778ec7 TFS9519 update route
5dae1fb TFS9270 add unit tests to password validator - remove lowercase tests
9fa6ece TFS9519 tfs8861 fix jshint issues
b0d5fdb Merge remote-tracking branch 'origin/mobile' into mobile
c5950b3 Merge branch 'mobile' of git.f-dev.net:otp into mobile
acd034b Merge branch '1.0' into mobile
d1a02e9 Merge branch 'mobile' of git.f-dev.net:otp into mobile
295b156 TFS9270 add unit tests for password validator
e86a147 TFS9269 uppercasing of passwords
e4ef09d TFS9519 tfs8861 Account_Summary: When account is not valid for account details and account activity, should navigate to an information page
3bde016 Added Autofac dll for Corrilian\Voyager\ TP failing in Environments.
0a4db69 Merge branch '1.0' of 192.168.0.100:otp into 1.0
2aef31c Fixed up unit test.
fb9fea9 Merge branch '1.0' of 192.168.0.100:otp into 1.0
2c45f54 Trying hashcode as key for Mfa TP Session
024ac2c (tag: build-1.3.2575.0) Bad merge
Last commit in this list is suspicious, because it was made in branch 1.0, but later was merged in master. So it should not appear in the list
git branch --contains 024ac2c
1.0
* master
git log --oneline --decorate --graph master..1.0 # I did not use --all because in this case I have huge history
* ec9988c (HEAD, tag: build-1.3.2616.0, 1.0_question, 1.0) Merge branch '1.0' into mobile
|\
| * e29326d Merge remote-tracking branch 'origin/1.0' into 1.0
| |\
| | * fae044b (tag: build-1.3.2615.0) Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | |\
| | | * d83f181 QC1824 WBC - Fix SIGN IN button on SessionTerminated page
| | | * 5af7889 QC1824 WBC - Redirect to Home after MultipleSessions. Remove not needed code from RecycleActiveSessionCommandHandler
| | * ee1fa8a Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * e7b6841 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * abe49b6 added more logging
| | * f571499 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * 77f8f92 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * 5ef9556 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * 3bde016 Added Autofac dll for Corrilian\Voyager\ TP failing in Environments.
| | * 0a4db69 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * 2aef31c Fixed up unit test.
| | * fb9fea9 Merge branch '1.0' of 192.168.0.100:otp into 1.0
| | * 2c45f54 Trying hashcode as key for Mfa TP Session
| | * 024ac2c (tag: build-1.3.2575.0) Bad merge
* | b716f00 Merge branch '1.0' into mobile
|\ \
| |/
| * 79f02ab Merge branch 'mobile' into 1.0
* | faa9bc3 TFS9437 send down correct brand id
* | 25ae928 Fix js hint errors
* | aef6132 Merge branch 'mobile' of git.f-dev.net:otp into mobile
|\ \
| * \ 50e31c3 Merge branch 'mobile' of git.f-dev.net:otp into mobile
| |\ \
| | * \ c6701f8 Merge remote-tracking branch 'origin/mobile' into mobile
| | |\ \
| | * | | 7addf23 TFS8597 Added tests for broadcast message, jslint fixed extra comma within dataclient
| | * | | 1f6a7e9 Merge remote-tracking branch 'origin/mobile' into mobile
| | |\ \ \
| | | | |/
| | | |/|
| | * | | 14566e8 TFS8597 broadcast message interupt feedback
| | / /
| * | | ed14bba TFS9720 updating the vm/js tests based on a greater understanding of how the flow of this page should work
| | |/
| |/|
| * | 86aef75 Merge branch 'mobile' of git.f-dev.net:otp into mobile
| |\ \
| | * \ 016f1db Merge branch 'mobile' of git.f-dev.net:otp into mobile
| | |\ \
| | | |/
| | * | 214649d TFS9130 - Added tests for BSB warning message and fixed logic determining when the message should be displayed.
| | * | 90dc5d0 TFS9130 - Mobile add payee page will now show warning if BSB bank name is not found, but not found to be invalid.
| | /
| * | 76b43a5 TFS9720 updating js tests to account for the change
| * | f0af24d Merge branch 'mobile' of git.f-dev.net:otp into mobile
| |\ \
| | |/
| | * cdf1952 TFS9723 pass down image url and image available properties in the bpayview controller
| * | 7ce87f3 TFS9720 correctly handling the required MFA challenge. Not using the controller to do this
| |/
| * 3921ab1 Merge remote-tracking branch 'origin/mobile' into mobile
| |\
| | * 5dae1fb TFS9270 add unit tests to password validator - remove lowercase tests
| | * c5950b3 Merge branch 'mobile' of git.f-dev.net:otp into mobile
| | |\
| | * | d1a02e9 Merge branch 'mobile' of git.f-dev.net:otp into mobile
| | * | 295b156 TFS9270 add unit tests for password validator
| | /
| * | e778ec7 TFS9519 update route
| * | 9fa6ece TFS9519 tfs8861 fix jshint issues
| * | b0d5fdb Merge remote-tracking branch 'origin/mobile' into mobile
| |\ \
| | |/
| | * acd034b Merge branch '1.0' into mobile
| | * e86a147 TFS9269 uppercasing of passwords
| * e4ef09d TFS9519 tfs8861 Account_Summary: When account is not valid for account details and account activity, should navigate to an information page
* 1d9691a TFS9112 Fix Bug in Mobile:Customer details- Navigation is not working on Time zone page.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment