Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation enhancements #115

Open
9 of 21 tasks
arxanas opened this issue Oct 12, 2021 · 9 comments
Open
9 of 21 tasks

Documentation enhancements #115

arxanas opened this issue Oct 12, 2021 · 9 comments
Labels
documentation Improvements or additions to documentation enhancement New feature or request

Comments

@arxanas
Copy link
Owner

arxanas commented Oct 12, 2021

  • README: Put installation at the top/make it easier to get started
  • README: Mention that it scales to large monorepos.
  • README: Add a link to the lightning-fast rebase demo.
  • README: Once git undo has a non-interactive mode, add an inline-playing demo to the README, so that the user doesn't have to visit another page to view the demo.
  • README: Call out speculative merging as a major feature.
  • Finish unfinished workflow documentation items:
    • Stashing
    • Divergent development
  • Possible new workflow documentation items:
  • Add documentation about git next/git prev --all/--branch flags.
  • Add documentation for git amend command.
@bcongdon
Copy link
Collaborator

+1 for docs relating to "updating local work on top of the remote main branch". Merging a PR and then rebasing the local branchless commits onto the new state of the remote branch was unintuitive the first few times I went through that process

@arxanas
Copy link
Owner Author

arxanas commented Oct 18, 2021

@bcongdon what was your workflow then vs now?

@arxanas arxanas added documentation Improvements or additions to documentation enhancement New feature or request labels Oct 18, 2021
@bcongdon
Copy link
Collaborator

Now, I run git fetch and git rebase origin/main, and resolve any conflicts. I still run into issues occasionally with (local) branch pointers becoming out of date, and I have to sometimes do additional git move's to update my subtree.

In a previous (mercurial) workflow, this was handled a bit gracefully with a catchall "sync" command, which implicitly pulled and rebased my local commits onto the trunk branch commit.

I bet my current git-branchless workflow is suboptimal though, so docs around best practices for syncing to a remote repo would be helpful (even if the docs aren't necessarily prescriptive)

@arxanas
Copy link
Owner Author

arxanas commented Oct 21, 2021

@bcongdon I hope to release a git sync command soon. In the meantime, I recommend that you use git move -d origin/main rather than git rebase origin/main, as it should behave uniformly better.

@terinjokes
Copy link

fwiw, git move -d origin/main doesn't seem to work if there are currently no commits on the stack, as it instead tries to create a cyclical loop. I'm used to running stg pull -m which handles both cases.

@arxanas
Copy link
Owner Author

arxanas commented Nov 16, 2021

@terinjokes what is the behavior of stg pull -m in that case? Does it just produce a no-op message?

@terinjokes
Copy link

terinjokes commented Nov 16, 2021

It's a noop if the local branch and the remote branch have no differences. Otherwise it effectively fast-forwards to match the remote branch.

@claytonrcarter
Copy link
Collaborator

@arxanas I took the liberty of writing up a wiki page for git reword: https://github.com/arxanas/git-branchless/wiki/Command:-git-reword

Please edit however however you like, or tell me what you'd like to see changed and I can work on it.

@arxanas
Copy link
Owner Author

arxanas commented Mar 27, 2022

@claytonrcarter Much appreciated, it looks great!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

4 participants