{"thread":{"id":"54395","subject":"Feature: checkout and merge","startedAt":"2020-10-12T11:12:53Z","lastAt":"2020-10-12T17:48:24Z","messageCount":3,"participants":["Victor Porton","Konstantin Tokarev","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"407326","messageId":"28a86c75-de4d-acbe-dab7-e5512961538c@narod.ru","threadId":"54395","inReplyTo":null,"subject":"Feature: checkout and merge","fromName":"Victor Porton","fromEmail":"porton@narod.ru","sentAt":"2020-10-12T11:05:58Z","receivedAt":"2020-10-12T11:12:53Z","isPatch":false,"sender":{"key":"porton@narod.ru","avatar":"https://gravatar.com/avatar/26fbbd66c3da4108798dc4fccb153ea484585216cc8f62e678c07a05e8dcd165?d=mp&s=160"},"body":"It is a very often need to checkout a branch and them merge the branch\nthat was before the checkout. Moreover after this is very often needed\nto push.\n\nSo please add the flags to `checkout`:\n\n1. to merge the old branch immediately after checkout\n\n2. to push after checkout\n\nI repeatedly write:\n\ngit checkout stable && git merge main && git push && git checkout main\n\n(I am not subscribed to this mailing list.)\n\n\n"},{"id":"407338","messageId":"5293161602514983@mail.yandex.ru","threadId":"54395","inReplyTo":"28a86c75-de4d-acbe-dab7-e5512961538c@narod.ru","subject":"Re: Feature: checkout and merge","fromName":"Konstantin Tokarev","fromEmail":"annulen@yandex.ru","sentAt":"2020-10-12T15:04:19Z","receivedAt":"2020-10-12T15:04:25Z","isPatch":false,"sender":{"key":"annulen@yandex.ru","avatar":null},"body":"\n\n12.10.2020, 14:12, \"Victor Porton\" <porton@narod.ru>:\n> It is a very often need to checkout a branch and them merge the branch\n> that was before the checkout. Moreover after this is very often needed\n> to push.\n>\n> So please add the flags to `checkout`:\n>\n> 1. to merge the old branch immediately after checkout\n>\n> 2. to push after checkout\n>\n> I repeatedly write:\n>\n> git checkout stable && git merge main && git push && git checkout main\n>\n> (I am not subscribed to this mailing list.)\n\nWhy not make a shell script to do this?\n\n\n-- \nRegards,\nKonstantin\n"},{"id":"407355","messageId":"xmqqo8l7pc7w.fsf@gitster.c.googlers.com","threadId":"54395","inReplyTo":"5293161602514983@mail.yandex.ru","subject":"Re: Feature: checkout and merge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-12T17:48:19Z","receivedAt":"2020-10-12T17:48:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Konstantin Tokarev <annulen@yandex.ru> writes:\n\n> 12.10.2020, 14:12, \"Victor Porton\" <porton@narod.ru>:\n>> It is a very often need to checkout a branch and them merge the branch\n>> that was before the checkout. Moreover after this is very often needed\n>> to push.\n>>\n>> So please add the flags to `checkout`:\n>>\n>> 1. to merge the old branch immediately after checkout\n>>\n>> 2. to push after checkout\n>>\n>> I repeatedly write:\n>>\n>> git checkout stable && git merge main && git push && git checkout main\n>>\n>> (I am not subscribed to this mailing list.)\n>\n> Why not make a shell script to do this?\n\nSounds like a very sensible suggestion.  \"merging and then pushing\nimmediately after\" without any validation step in between is not for\neverybody and being able to implement such a custom workflow is why\nwe have these individual steps as discrete commands.\n\nThanks.\n"}]}