github - git: Merge branch logs -


how can merge history of git project commits histories considered parts of 1 branch?

currently have this:

* 465a83a highlight search * 37a367d tab=3; autosavesession (not using yet) *   9f2559c merge branch 'master' of github.com:shahverdy/.vim |\   | * 6bf7783 savesession added. | |\   | | * 6cdd383 changes path allocation | | |\   | | | * de535b2 update readme.md | | | * cb78dae update readme.md | | | * 6664428 update readme.md | | | * b6f3869 modifications + readme.ms | | | * 0924e77 oops! vimrc not included in last commit | | | * c030172 sweeping away ... | | | * d67280e bundle installer added, extaras sweeped away | | | * 10a669c cursors fixed... | | | * 9dfd01f cursors edited ... | | | * 0b5d8aa syntax php , javascript added | | | * dd5a21d bug fixed | | | * ad5b9f2 syntax php , javascript added | | | * 99e5595 fixed code folding+ search highlighting | | | * 69c7f77 file explorer fixed | | | * ba5fbf7 .vimrc added | | * f875ee1 totel reset | * 9edf692 update * 9c71074 new plugins

and want this:

* 465a83a highlight search * 37a367d tab=3; autosavesession (not using yet) * 9f2559c merge branch 'master' of github.com:shahverdy/.vim * 6bf7783 savesession added. * 6cdd383 changes path allocation * de535b2 update readme.md * cb78dae update readme.md * 6664428 update readme.md * b6f3869 modifications + readme.ms * 0924e77 oops! vimrc not included in last commit * c030172 sweeping away ... * d67280e bundle installer added, extaras sweeped away * 10a669c cursors fixed... * 9dfd01f cursors edited ... * 0b5d8aa syntax php , javascript added * dd5a21d bug fixed * ad5b9f2 syntax php , javascript added * 99e5595 fixed code folding+ search highlighting * 69c7f77 file explorer fixed * ba5fbf7 .vimrc added * f875ee1 totel reset * 9edf692 update * 9c71074 new plugins

edit

i tried git rebase, output current branch master date., , still history shown before.

thanks

use git rebase --interactive 9c71074 - default merge commits squashed. here example.

ebg@ebg(390)$ git log --graph --oneline --all *   67fc064 merge branch 'br-b' |\   | *   ae81ba0 merge branch 'br-c' br-b | |\   | | * 7fc3f2c c2 | | * ee878fc c1 | | * 08bbe31 c | * | 7112b66 b2 | |/   | * fb2bb16 b * | a4c6fb7 a2 |/   * e2f832e ebg@ebg(391)$ git rebase --interactive e2f832e rebased , updated refs/heads/master. ebg@ebg(392)$ git log --graph --oneline --all * 1123db2 c2 * 47b327e c1 * 8136393 c * 4276b1f b2 * 1020ffa b * a4c6fb7 a2 | *   ae81ba0 merge branch 'br-c' br-b   # not on master | |\   | | * 7fc3f2c c2 | | * ee878fc c1 | | * 08bbe31 c | * | 7112b66 b2 | |/   | * fb2bb16 b |/   * e2f832e ebg@ebg(393)$ git log --graph --oneline       # master * 1123db2 c2 * 47b327e c1 * 8136393 c * 4276b1f b2 * 1020ffa b * a4c6fb7 a2 * e2f832e

Comments

Post a Comment

Popular posts from this blog

monitor web browser programmatically in Android? -

i've got tricky question here. need users make payment bank (namely barclaycard) in uk. so, have https url , add parameters (such amount pay, order reference, etc) url, start http connection intent.actionview, redirect user browser can enter credit card details on bank's webpage , make payment our account successfully. far ? the code use below (i changed values privacy reasons) problem is, need app when user has completed/failed/cancelled payment. barclaycardautomatically redirects particular url when payment has succeeded, 1 if failed. there no way of knowing when barclaycard payment has succeeded go android app somehow ? button cardbutton = (button) findviewbyid(r.id.card_button); cardbutton.setonclicklistener(new view.onclicklistener() { @override public void onclick(view arg0) { string prehashstring = new string(); string prohashstring = new string(); string shapassphrase = new string(); shapassphrase = "gsvth£h70zkh...
Read more

Shrink a YouTube video to responsive width -

i have youtube video embedded on our website , when shrink screen tablet or phone sizes stops shrinking @ around 560px in width. standard youtube videos or there can add code make go smaller? you can make youtube videos responsive css. wrap iframe in div class of "videowrapper" , apply following styles: .videowrapper { float: none; clear: both; width: 100%; position: relative; padding-bottom: 56.25%; padding-top: 25px; height: 0; } .videowrapper iframe { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } the .videowrapper div should inside responsive element. padding on .videowrapper necessary keep video collapsing. may have tweak numbers depending upon layout.
Read more

wpf - PdfWriter.GetInstance throws System.NullReferenceException -

i'm trying create pdf document using itextsharp 5.3.4 using following document document = new document(); filestream stm = new filestream(filename, filemode.create); pdfwriter writer = pdfwriter.getinstance(document, stm); i'm getting system.nullreferenceexception following stack trace: system.nullreferenceexception occurred hresult=-2147467261 message=la référence d'objet n'est pas définie à une instance d'un objet. source=itextsharp stacktrace: à itextsharp.text.version.getinstance() innerexception: i've verified neither document nor stm null, , if select "continue" in vs12 document created - exception thrown. updated itextsharp 5.4.0 , it's still occurring. can't find information on anywhere - got ideas? make sure not catching exceptions. nullreferenceexception can 1 caught , handled inside itextsharp, don't care it. fact can continue supports theory. change following setting verify: debug -> exceptions ...
Read more