All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [RFC/PATCH 0/2] Explain newbies the "commit before pull" flow
Date: Fri, 20 Nov 2009 16:59:25 +0100	[thread overview]
Message-ID: <1258732767-12741-1-git-send-email-Matthieu.Moy@imag.fr> (raw)

A colleague of mine asked me "why do I need to commit before I can
pull", and I was about to send a link to the user manual, when I
noticed I couldn't find any explanation about that there.

This little patch serie propose a few more sentence in the user
manual, and a little more verbose error message for those who don't
read the docs.

I'm not sure the wording is the best we can do. Native-speakers and
Git gurus are welcome to improve it ;-).

Matthieu Moy (2):
  merge-recursive: point the user to commit when file would be
    overwritten.
  user-manual: Document that "git merge" doesn't like uncommited
    changes.

 Documentation/user-manual.txt |   14 +++++++++++---
 merge-recursive.c             |    6 ++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

             reply	other threads:[~2009-11-20 16:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-20 15:59 Matthieu Moy [this message]
2009-11-20 15:59 ` [PATCH 1/2] merge-recursive: point the user to commit when file would be overwritten Matthieu Moy
2009-11-20 18:05   ` Junio C Hamano
2009-11-22 22:09     ` Matthieu Moy
2009-11-20 15:59 ` [PATCH 2/2] user-manual: Document that "git merge" doesn't like uncommited changes Matthieu Moy
2009-11-20 20:19   ` Junio C Hamano
2009-11-22 22:18     ` Matthieu Moy
2009-11-22 23:57       ` Junio C Hamano
2009-11-23  7:51         ` Matthieu Moy
2009-11-22 22:26 ` [PATCH 1/2 v2] merge-recursive: point the user to commit when file would be overwritten Matthieu Moy
2009-11-22 22:26 ` [PATCH 2/2 v2] user-manual: Document that "git merge" doesn't like uncommited changes Matthieu Moy
2009-11-23  0:08   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1258732767-12741-1-git-send-email-Matthieu.Moy@imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.