[Bug]: Duplicate declaration of `grm` in git.aliases.bash about bash-it

[davidpfarrell]

I had to sit with it for a bit, but I've come around to seeing value in having the git rebase aliases use the grb* prefix. This would result in changes to:

• grm => grbm
• grmi => grbmi
• grma => grbma

There are a couple that have the r later in their names, ie:

• alias gpr='git pull --rebase'
• alias gprom='git fetch origin $(get_default_branch) && git rebase ...

I think its okay to leave these as-is (ie don't change to *rb*)

(side note re: gdel - I think this just needs to go away)

[davidpfarrell]

Good catch ! Hope it didn't hurt too much when you discovered it ...

My take is to remove both the grm as "git rm" alias AND the gdel alias, which deletes a branch but you wouldn't know from the alias name ...

gr* seems solidly assigned to rebase and I prefer consistency over most other things ...

[bittner]

gr* seems solidly assigned to rebase and I prefer consistency over most other things ...

Actually, my take is, following your suggestion in #2159 (review), that grb should be assigned to rebase. Everything that is related to "rebase" may hence be prefixed by grb.

Following that logic we may keep grm as an alias for "remove" (which is easy for muscle memory, because it's very close to the original git rm) and, optionally, keep gdel as an alternative. – I've never used gdel before, TBH. Did you?

In my brain, for example, gr is wired to "remote" (e.g. grv = git remote -v).

[bittner]

Then again, git pull is gl, and git push is gp, currently. That clashes with what you just proposed. 😟

[davidpfarrell]

I don't see how they are related at all, as I was just seconding what you already proposed (git rebase aliases using prefix grb*), however ...

gl as an alias for git pull is an abomination that also needs to go away.
gp is too ambiguous and should also go away (and in fact I disable it in my local)

gpu* for git push aliases and gpl* for git pull aliases is almost okay, but still a bit tough ...

In general, I have a lot of issues with the git aliases, but my opinion is only a small drop in the bucket and, without a better place for discord on such things, I don't worry about trying to fix the whole file :)

[bittner]

I would tackle this as you suggested above, once we get #2159 merged.