this post was submitted on 10 Jul 2023
57 points (100.0% liked)

Git

2910 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
 

You can use git switch - to switch to the previous branch. In the following example, we see switching back and forth between branches main and my_dev_branch:

C:\git\my-repo [my_dev_branch]> git switch -
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
C:\git\my-repo [main ≡]> git switch -
Switched to branch 'my_dev_branch'
C:\git\my-repo [my_dev_branch]>

Edit: Old habits die hard. Updated to use switch instead of checkout since switch has a clearer responsibility. Obviously they work exactly the same for this scenario.

top 25 comments
sorted by: hot top controversial new old
[–] [email protected] 16 points 1 year ago* (last edited 1 year ago) (1 children)

Which follows the similar functionality used by the cd - command to switch to the previous directory you were in. Very handy!

[–] [email protected] 9 points 1 year ago (2 children)
[–] [email protected] 8 points 1 year ago (3 children)

There's more! Well, it's more a bash thing than a cd thing.. in bash the variable $_ refers to the last argument to the previous command. So you can do the following:

> mkdir -p my/nested/dir
> cd $_
> pwd
/home/user/my/nested/dir

It's handy for a whole host of things, like piping/touching then opening a file, chown then chmod, etc.

[–] [email protected] 4 points 1 year ago (1 children)

On many terminal emulators you can also use Alt-. to search through your history of previous arguments, so mkdir foo followed by cd [Alt-.] will populate your command line with cd foo for example. If you have some other command in between you can just hit Alt-. repeatedly

[–] [email protected] 2 points 1 year ago

Or ESC followed by "." Repeating it works too.

[–] [email protected] 2 points 1 year ago

This is amazing ♥️

[–] [email protected] 2 points 1 year ago

That's incredible, I never knew that. Thank you!

[–] [email protected] 5 points 1 year ago

There's also pushd and popd so that you can pushd into one directory, move around as much as you want and then go back to before the pushd with popd

[–] [email protected] 12 points 1 year ago (4 children)
[–] [email protected] 5 points 1 year ago (1 children)

Old habits die hard. Thanks for pointing this out. I updated the post.

[–] [email protected] 2 points 1 year ago (1 children)

Oh lol, I was just trying to poke fun, sorry if it came across as accusatory. 😎👍

[–] [email protected] 1 points 1 year ago

Not at all. It was a funny comment (I upvoted it) 👍 But you are also right. It makes more sense to refer to switch and restore whenever possible.

[–] [email protected] 3 points 1 year ago (2 children)

What's the difference? Genuine question

[–] [email protected] 4 points 1 year ago

Checkout was one of those commands that I joking would call Turing complete because of how much you can do with it (I haven't actually tried to see if it is, but am fully prepared for someone to be nerd sniped and tell me it actually is). I think they're mostly the same, but switch and restore were added as more straightforward versions of checkout and reset.

[–] [email protected] 3 points 1 year ago (1 children)

Well one starts with an s, the other with a c... :P

They changed the command to clarify what it does, checkout was / is used for switching branches as well as branch creation but has connotations of doing some locking in the repo from older vcs software.... I think. the new commands are switch and branch. check the docs

Idk what the deal is with switch, I thought it wasn't supposed to be creating branches but right in the docs there's a flag for it???

Im the kind of user that just deletes .git and starts over when I f up the repo, so take my git advice with a tablespoon of salt.

[–] [email protected] 3 points 1 year ago (1 children)

I switch to using switch since git switch auto-creates the local branch from the remote branch, if the branch doesn't exist yet, and a remote branch with the corresponding name exists.
Also git switch -c for auto-creating a new branch, even if there is no remote branch for it

[–] [email protected] 2 points 1 year ago

If I remember it correctly, git checkout also automatically creates the local branch from the remote branch (of the same name), and sets up tracking.

[–] [email protected] 1 points 1 year ago

Came here to say this

[–] [email protected] 1 points 1 year ago
[–] [email protected] 6 points 1 year ago

Great tip!! Thanks!

[–] [email protected] 3 points 1 year ago

This led me down a real rabbit hole of looking at what you can do with git commands, very neat.

There's a few more things you can do which I found, like switching to the Nth branch you last had checked out: https://www.w3docs.com/snippets/git/how-to-checkout-the-previous-branch.html

[–] [email protected] 3 points 1 year ago

But evidently git rev-parse - will not print out the previous branch 😔 that would have been useful for scripts

[–] [email protected] 2 points 1 year ago

I always forget to use this one, thanks for the reminder

[–] [email protected] 2 points 1 year ago

That's so cool, this can be my favorite command so on. Switching between two branches is easy with that.

[–] [email protected] 1 points 1 year ago

Note that git checkout - / git switch - examine reflog to find previous branch. Which means if you renamed the branch, at least current version of Git would be unable to run git switch -.

load more comments
view more: next ›