From: Thomas Rast <trast@student.ethz.ch>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Petr Baudis <pasky@suse.cz>,
<git@vger.kernel.org>
Subject: Re: [PATCH 4/6] Documentation: emphasize when git merge terminates early
Date: Tue, 12 Jan 2010 00:11:33 +0100 [thread overview]
Message-ID: <201001120011.38704.trast@student.ethz.ch> (raw)
In-Reply-To: <20100111083754.GD23806@progeny.tock>
Jonathan Nieder wrote:
> +In some other version control systems, you merge/update and then
> +commit, with the risk of clobbering your changes with humongous
> +conflicts. You shouldn't be pulling or merging if you haven't got
> +your own work into good shape and committed it locally (see also
> +linkgit:git-stash[1]).
Isn't it wrong to talk about other VCS, especially when writing down
what Git does *not*? The user wants to know what git *does*,
otherwise he wouldn't be looking in the manual.
> +If all named commits are already ancestors of `HEAD`, 'git merge'
> +will exit early with the message "Already up-to-date."
<aside>
I suspect this is little-known but the equivalent message for an
octopus is actually: "Already up-to-date. Yeeah!"
</aside>
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-01-11 23:11 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 17:03 [PATCH 1/2] Documentation/git-merge: reword references to "remote" and "pull" Thomas Rast
2010-01-07 17:03 ` [PATCH 2/2] Documentation: warn prominently against merging with dirty trees Thomas Rast
2010-01-07 17:03 ` [NON-PATCH 3/2] Documentation/git-merge: format full commands in typewriter font Thomas Rast
2010-01-07 20:25 ` Jonathan Nieder
2010-01-07 21:08 ` Junio C Hamano
2010-01-07 18:01 ` [PATCH 1/2] Documentation/git-merge: reword references to "remote" and "pull" Junio C Hamano
2010-01-10 0:02 ` [PATCH v2 0/4] Documentation style fixes Thomas Rast
2010-01-10 0:02 ` [PATCH v2 1/4] Documentation/git-merge: reword references to "remote" and "pull" Thomas Rast
2010-01-10 4:13 ` Jonathan Nieder
2010-01-10 12:24 ` Thomas Rast
2010-01-23 22:48 ` [PATCH] Documentation: merge: use MERGE_HEAD to refer to the remote branch Jonathan Nieder
2010-01-10 0:02 ` [PATCH v2 2/4] Documentation: warn prominently against merging with dirty trees Thomas Rast
2010-01-10 4:49 ` Jonathan Nieder
2010-01-10 6:31 ` Junio C Hamano
2010-01-10 12:16 ` Thomas Rast
2010-01-11 2:13 ` Jonathan Nieder
2010-01-11 2:30 ` Junio C Hamano
2010-01-11 4:13 ` Jonathan Nieder
2010-01-11 8:21 ` [PATCH 0/6] " Jonathan Nieder
2010-01-11 8:27 ` [PATCH/RFC 1/6] Documentation: clarify one-line description for merge Jonathan Nieder
2010-01-11 8:30 ` [PATCH 2/6] Documentation: merge: add an overview Jonathan Nieder
2010-01-11 10:09 ` Junio C Hamano
2010-01-11 8:37 ` [PATCH 4/6] Documentation: emphasize when git merge terminates early Jonathan Nieder
2010-01-11 23:11 ` Thomas Rast [this message]
2010-01-11 8:39 ` [PATCH 5/6] Documentation: merge: add a section about fast-forward Jonathan Nieder
2010-01-11 8:43 ` [PATCH 6/6] Documentation: tweak How Merge Works Jonathan Nieder
2010-01-11 23:11 ` Thomas Rast
2010-01-13 10:44 ` [PATCH 0/6] Re: Documentation: warn prominently against merging with dirty trees Petr Baudis
2010-01-13 6:55 ` [PATCH v2 2/4] " Junio C Hamano
2010-01-10 0:02 ` [PATCH v2 3/4] Documentation: format full commands in typewriter font Thomas Rast
2010-01-10 3:31 ` Jonathan Nieder
2010-01-10 0:07 ` [PATCH v2 0/4] Documentation style fixes Thomas Rast
2010-01-10 0:19 ` Thomas Rast
2010-01-10 6:34 ` Junio C Hamano
2010-01-10 12:10 ` Thomas Rast
2010-01-10 12:10 ` [PATCH 1/2] More missed dashed 'git-cmd' forms Thomas Rast
2010-01-10 12:10 ` [PATCH 2/2] More missed `code snippets` Thomas Rast
2010-01-10 12:11 ` [PATCH] Documentation: show-files is now called git-ls-files Thomas Rast
2010-01-18 1:18 ` [PATCH v2 0/4] Documentation style fixes Junio C Hamano
2010-01-19 17:29 ` Thomas Rast
2010-01-19 17:39 ` Jonathan Nieder
2010-01-10 7:12 ` Junio C Hamano
[not found] ` <9516c897017ec420403bb7f687fb8962de42cb7c.1263081032.git.trast@student.ethz.ch>
2010-01-10 2:56 ` [PATCH v2 4/4] Documentation: spell 'git cmd' without dash throughout Jonathan Nieder
2010-01-10 2:59 ` [PATCH 1/2] Documentation: git gc packs refs by default now Jonathan Nieder
2010-01-10 3:01 ` [PATCH 2/2] Documentation: tiny git config manual tweaks Jonathan Nieder
2010-01-10 12:21 ` [PATCH v2 4/4] Documentation: spell 'git cmd' without dash throughout Thomas Rast
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=201001120011.38704.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pasky@suse.cz \
/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.