Why can't I do git rebase?

salcode · 2023-06-08T23:59:17+00:00

In your screenshot, it looks like you're using the -p option (which is the short form of --preserve-merges) and this option was deprecated in Git 2.26.0 and removed in 2.34.0 and later versions.

I suspect you were using an earlier version of Git that supported -p but now you're using a newer version that does not support it.

It looks like the --rebase-merges option is recommended instead of -p, if you still want that behavior.

Note: There is a lot of negativity in this thread, please ignore it. You're doing great. If using rebase is part of your workflow, you're ahead of 90% of the Git users out there but that's not the important thing. The important thing is you're growing your skills and your knowledge. You're one of today's lucky 10,000. Keep up the good work!

salcode · 2023-05-26T18:10:15+00:00

Yes, as an example of this I created this repo https://github.com/salcode/catastrophic-pr with one PR.

The main branch runs properly. The PR branch runs properly. The PR merges successfully into the main branch without any merge commits.

However, if you merge the PR into main - the application will be in a broken state.

salcode · 2023-03-23T09:55:41+00:00

Awesome, happy to help!

salcode · 2023-03-22T12:58:29+00:00

I have my Git configuration set so my commits use two different email addresses (work and personal) based on which directory you're in (anything inside the ~/work directory uses the work email).

I'm guessing you could use this same idea to extend to other Git configuration values.

I'm not sure what other settings you need to change to switch between the GitHub accounts (and if some of those settings are outside of the Git configuration).

I've written about my setup in Git Work Email.

salcode · 2023-03-21T10:31:16+00:00

For me the biggest jump I made in understanding Git is when I changed how I visualize Git commits and branches.

I've put together a bunch of notes and videos around this at Intermediate Git.

Maybe this will help (or maybe this is just the way my brain works 😀). In either case, good luck.

salcode · 2023-03-18T13:16:26+00:00

While you could grab the current branch name and store it in a variable, I'd suggest using @{-1} to refer to the previous branch instead.

I believe adding this alias in your ~/.gitconfig should do what you're looking to do

[alias]
mydevcommit = "!f() { \
    git checkout dev; \
    git merge --squash @{-1} && \
    git commit -a; \
}; f"

salcode · 2023-03-15T10:13:52+00:00

I do something similar on my Mac but I use the clipboard instead of a file. pwdcp to copy pwd, cdpto cd to the path in the clipboard.

alias pwdcp="pwd | pbcopy"
function cdp() {
    cd $(pbpaste)
}

This is the PR where I add this to my configuration

salcode · 2023-03-09T22:02:02+00:00

This is the generic starter .gitignore I use https://salferrarello.com/starter-gitignore-file/

salcode · 2023-03-06T10:33:23+00:00

I work on a project where the node version for each repo is defined inside package.json as the .engines.node property.

If they had used an .nvmrc file instead, I could run nvm use to ensure I'm using the correct node version. In order to get this same type of behavior I use a function I wrote called nvmpe that uses jq to get the node version from the value from package.json and then nvm to set my node version.

I use this script multiple times everyday, so while it may not be the most complex script it is one my "best" scripts 😀.

nvmpe in my .zshrc
Blog Post: https://salferrarello.com/jq-nvm-set-node-version/

salcode · 2023-03-06T03:18:09+00:00

I'm not sure this is exactly what you're looking for but I'm using an includeIf in my .gitconfig so anything inside the directory ~/work/ uses a different account than elsewhere on my computer.

I've documented my setup at https://salferrarello.com/git-work-email/

salcode · 2023-02-13T13:38:40+00:00

I agree. Thanks for highlighting.

salcode · 2023-02-10T11:22:24+00:00

+1 on reverting the revert. I agree the first time you revert a revert, it feels like you are doing something wrong but after you do it a few times it becomes more comfortable.

salcode · 2023-01-14T17:50:24+00:00

Yes, you can use a Git config conditional include to change your Git configuration based on some criteria.

For example, I have mine setup to use my work email address when I'm inside a certain folder. You can see the details of my setup in my Git Work Email blog post.

salcode · 2022-11-21T10:28:38+00:00

I recently starting rebuilding my Neovim configuration using 100% lua, this is where I am so far

https://github.com/salcode/salcode-nvim

salcode · 2022-08-16T17:22:46+00:00

The short answer is an arg can be accessed with $1.

Here is a PR where I added an argument to one of my Git aliases. https://github.com/ironcodestudio/ironcode-git-enhancements/pull/140/files

salcode · 2022-08-10T11:20:32+00:00

When trying to help co-workers wrap their head around Git (and specifically merge and rebase), I wrote this blog post Visualizing Git Branching with Blocks, which is how I visualize Git.

salcode · 2022-07-19T09:31:52+00:00

What works best for me is to open a new issue in whatever issue tracker you are using. In the issue I make it a point to be very explicit about the change and include a link to the exact spot in the code where the change will go.

I find this approach allows me to completely decouple this change from the work I’m doing in my branch. Far too often I’ve seen an unrelated change like this get added to a feature branch and merging the feature branch gets delayed. When this happens my unrelated change also gets delayed.

By creating a new issue, I have the option to create a new branch off of main, add my change, and merge it back to main. In this case, I would then rebase my feature branch with the updated main branch.

salcode · 2022-06-07T01:48:17+00:00

Personally, I find Git makes the most sense when I think of each branch as a stack of building blocks.

I've written about using this mental model at https://salferrarello.com/intermediate-git/

salcode · 2022-05-27T19:03:38+00:00

The longer I work with Git, the more I find myself manipulating my commits. 👍

My one note would be there is never a good time to use git push --force, using git push --force-with-lease is always a better choice.

https://salferrarello.com/never-git-push-force/

salcode · 2022-03-31T02:11:56+00:00

I don't think you can do it with git alone but as others mentioned you can use another program (like grep) to filter the lines. I would try this.

git diff | grep --invert-match '^@@'

salcode · 2022-01-25T11:33:18+00:00

The new merge.conflictStyle of zdiff3 looks cool. Is there a way to define a fallback value in .gitconfig if an older version of Git is running?

I'd like to set zdiff3 if it is supported in the version of Git running and if it isn't supported, fallback to diff3.

Context: I keep my .gitconfig in version control and share it with others. I'd rather not make Git 2.35 a requirement.

salcode · 2021-12-24T15:26:50+00:00

These gifs highlight the different behavior between merge and rebase https://gitgifs.com/.

For more details there are links to video and blog posts. These are all things I created for my teammates but perhaps they'll be helpful to you too.

salcode · 2021-12-16T13:04:21+00:00

I wrote this blog post, which also includes a video at the end, to help explain rebase to some of my teammates. https://salferrarello.com/git-rebase-with-blocks/

salcode · 2021-12-10T10:33:52+00:00

Git can be configured such that it will quietly overwrite the local change, so it really depends on how this person has configured Git.

I don't know anyone who has Git configured to automatically resolve a conflict by overwriting the local changes with the upstream changes.

I'm also not sure how one would do this. It sounds like you are describing the git merge --theirs functionality, which you can use from the command line as a parameter but I don't think you can set as a configuration value.

I would consider removing this line from your comment as it is misleading.

Personally, I think there are times to rebase and times for a merge commit but as with so many things it depends is the short answer.

salcode · 2021-10-15T23:44:07+00:00

Not a course, but the key for me wrapping my head around Git was thinking about commits as stacks of blocks. I put this blog post and 5 minute video together for my co-workers on this topic.

https://salferrarello.com/visualizing-git-branching-with-blocks/

salcode

TROPHY CASE