Communities

Writing

Codidact Meta

The Great Outdoors

Photography & Video

Scientific Speculation

Cooking

Electrical Engineering

Judaism

Languages & Linguistics

$Mathematics$

tag:snake search within a tag

answers:0 unanswered questions

user:xxxx search by author id

score:0.5 posts with 0.5+ score

"snake oil" exact phrase

votes:4 posts with 4+ votes

created:<1w created < 1 week ago

post_type:xxxx type of post

Search help

Notifications

Mark all as read See all your notifications »

Q&A Meta

Q&A

Posts Tags Edits

Ask Question

Comments on Get notified when there are unmerged changes from origin

Post

Get notified when there are unmerged changes from origin

−0

Sometimes I work with Git repos that have some changes fetched but not yet merged to the local branch. Occasionally I make commits without noticing this, which necessitates rebase/conflict resolution.

I would like to be notified when I'm working with a Git repository such as this. Is there a way to configure either Git or my shell (fish) to automatically print a message like below?

Warning: Local branch is not even with upstream, merge changes to rectify.

It doesn't have to be a message, just any reasonable way of notifying me will do.

git convenience automation

posted 4 months ago

CC BY-SA 4.0

4mo ago by Michael‭

matthewsnyder‭

1806 reputation 122 75 285 109

Raw

Markdown

History

is a duplicate

This question has been asked before and has already been answered. It should be marked as a duplicate.

Please enter the URL of the proposed duplicate in the details field below.

not constructive

This question cannot be answered in a way that is helpful to anyone. It's not possible to learn something from possible answers, except for the solution for the specific problem of the asker.

1 comment thread

git log --all --graph --oneline (1 comment)

alx‭ wrote 4 months ago

copy link

Not an answer, but rather a different approach: visualizing the tree.

After I do git-fetch(1), I usually print the log, to see how exactly the upstream differs from me:

$ git log --oneline --graph main neomutt/main -5
* ef540729d (neomutt/main) Remove unused declaration (#4343)
* accac212a ignore macro events in mw_yesorno()
* 23578d66b Fix '&&' within '||' warning (#4340)
| * 3b2e17a26 (HEAD -> main) mutt/memory.[ch]: Add mutt_mem_reallocarray()
|/  
* f10c0f0dd Fix function pointer types (#4337)

Here it's obvious that I need to rebase. If there aren't many branches, you can use --all instead of specifying the branches.

I have some aliases for this in my ~/.gitconfig:

[alias]
	lgo = log --graph --oneline --abbrev=12
	lago = lgo --all

So I usually run git lago after git fetch origin.