git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: interactive rebase results across shared histories

From
DDavid <bouncingcats@gmail.com>
Date
Feb 22, 2016, 07:41 UTC
Message-ID
<CAMPXz=r23aor3P4XQ3bb1iNsmO9idAUWhGrLhKpMdGa4P_Or8w@mail.gmail.com>
In-Reply-To
<56C91D21.90306@moritzneeb.de>
On 21 February 2016 at 13:12, Moritz Neeb <lists@moritzneeb.de> wrote:
Show 15 quoted lines
>
> On 02/20/2016 11:58 PM, Seb wrote:
>>
>> I've recently learnt how to consolidate and clean up the master branch's
>> commit history.  I've squashed/fixuped many commits thinking these would
>> propagate to the children branches with whom it shares the earlier parts
>> of the its history.  However, this is not the case; switching to the
>> child branch still shows the non-rebased (dirty) commit history from
>> master.  Am I misunderstanding something with this?
>
> [snip]
>
> Maybe, to get a better understanding, you could use visualization tool
> like "tig" or "gitk" to observe what happens to your commits (hashes)
> and branches (labels) and just play around with some of these operations.
 Seb,
If you have a gui environment, the command
  gitk --all
will show you diagrams that will complement the explanations
others have given you here. You must specify --all to see more
than one branch.

And if you give a branch two names before rebasing one of those names, then you will easily be able to compare before and after.

Previous: SebNext: Seb
Message 6 of 13 in “interactive rebase results across shared histories”
  1. SebFeb 20, 2016
  2. Moritz NeebFeb 21, 2016
  3. SebFeb 21, 2016
  4. Eric SunshineFeb 21, 2016
  5. SebFeb 22, 2016
  6. DavidFeb 22, 2016
  7. SebFeb 23, 2016
  8. Moritz NeebFeb 23, 2016
  9. Kevin DaudtFeb 23, 2016
  10. SebFeb 23, 2016
  11. DavidFeb 26, 2016
  12. SebFeb 26, 2016
  13. Stepan KasalFeb 26, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.