git log - Logging git commits till a commit id when pulled with git pull --rebase -

-

चलो मान लीजिए कि git लॉग में निम्न कमिट हैं 

  commit15 commit14 commit13 commit12 commit11 commit10 । । <

मैंने 

  git log - spety = format: '% h |% H | फाइल द्वारा 14 तक काम करने के लिए git लॉग को सहेजने की कोशिश की है। % An |% ai |% s '$ commitid | Grep -v "मर्ज शाखा 'मास्टर' का" & gt; 'लॉग फाइल करने के लिए पथ जिसमें कॉमिटिड तक git लॉग होना चाहिए'

यह एक मामले को छोड़कर ठीक काम कर रहा है, अर्थात

जब कमिट किया जाता है और कमांड 13 को खींचने के बाद धकेल दिया जाता है git pull --rebase के साथ, जब मैं git log commit14 का उपयोग करते हुए commit4 तक git लॉग को सहेजने की कोशिश करता हूं मैं कमिट 12 और कमिट 13 देख सकता हूं लेकिन जब तक मैं 15 तक काम करने की कोशिश नहीं करता हूं git log commit15 का उपयोग करना प्रतिबद्ध है 12 और 13 प्रतिबद्ध 14 के तहत सूचीबद्ध हैं

मुझे पता है कि समस्या --rebase के साथ है, क्या किसी भी तरह से मैं किसी विशिष्ट आईडी तक प्रतिबद्धता लॉग कर सकता हूं यहां तक ​​कि उसके नीचे भी ऐसा किया गया है जिसे इसे ऊपर की ओर रिसाव किया गया है? (मैंने देखा कि जीआईटी रेपो, कमिट 12 और कमिशन 13 कमेट के तहत सूचीबद्ध हैं)


Comments

Post a Comment

Popular posts from this blog

apache - 504 Gateway Time-out The server didn't respond in time. How to fix it? -

-
Using a form submission on an embedded iframe , the customer downloads a compressed log file Requested. The request was sent to the server, which is the compressed log files, perform some database operations and returns a compressed file. After just 2 minutes, 504 gateway time-out server did not respond timely message on browser net panel How to fix this error? The log files were taking a long time to compress, and timeout was set to 2min The error was fixed by extending the file file: # # timeout: The number of seconds before getting the time out. # # # Timeout 120 timeout 600
Read more

c# - .net WebSocket: CloseOutputAsync vs CloseAsync -

-
We have a working ASP.NET Web API REST service, which is one of the methods of our controller, HTTPTTEX. .) Socket handler code looks something like this ... Public async task socket handler (AspNetWebSocketContext context) {_webSocket = context.WebSocket; ... while (! Cts.IsCancellationRequested) {WebSocketReceiveResult Results = _webSocket.ReceiveAsync (Input Segment, cts.Token) .Result; WebSocketsStateCollusocketState = _webSocket.State; If (result.MessageType == WebSocketMessageType.Close || currentSocketState == WebSocketState.CloseReceived) {// What should I use. CloseAysnc () or. CloseOutputAsync ()? _webSocket.CloseOutputAsync (WebSocketCloseStatus.NormalClosure, "Client Requested", cts.Token). Wait (); } If (currentSocketState == WebSocketState.Open) {...}}} .What is the difference between .CooseAsync () and CloseOutputAysnc ()? I tried both of them and they both seemed to work fine but some difference should be the same they both describe very similar to...
Read more

c++ - How to properly scale qgroupbox title with stylesheet for high resolution display? -

-
I am trying to apply a stylesheet for QGroupBox (QT4.8), which works on the normal screen ( 96 dpi) high resolution screen (Yoga 2 Pro, 3200x1800, 275 dpi, windows 8.1). The following style looks good on the 275 dpi screen, but the top margins on a regular 96 dpi screen are far too big. QGroupBox {border: 1px solid red; Range radius: 7px; Margin-top: 12x; } QGroupBox :: Title {subcontrol-origin: margin; Subcontrol-position: left above; Padding-left: 10px; Padding-right: 10px; } Changing the top-margin has an effect, but I did not get a proper setting which works on both screens. If I shorten the value, the content of the group box overlaps with the title on 275 dpi screen. I was also playing with units "East", "PX", "MX", "PT". Reading the document I would have guessed, "2 X" was the correct solution, which should be scaled with different screen resolutions. Without the stylesheet, the groupbox works well on both screens. ...
Read more