Re: git pull opinion

[Junio C Hamano <gitster@pobox.com>]

Aghiles <aghilesk@gmail.com> writes:

> Is there an "easier" way to pull into a dirty directory ? I am
> asking this to make sure I understand the problem and not
> because I find it annoying to type those 4 commands to perform
> a pull (although some of my colleagues do find that annoying :).

You need to switch your mindset from centralized SVN workflow.

The beauty of distributedness is that it redefines the meaning
of "to commit".  In distributed systems, the act of committing
is purely checkpointing and it is not associated with publishing
the result to others as centralized systems force you to.

Stop thinking like "I need to integrate the changes from
upstream into my WIP to keep up to date."  You first finish what
you are currently doing, at least to the point that it is
stable, make a commit to mark that state, and then start
thinking about what other people did.  You may most likely do a
"git fetch" followed by "git rebase" to update your WIP on top
of the updated work by others.

Once you get used to that, you would not have "a dirty
directory" problem.