Re: Obscure error/warning/information message from git pull

[Rob Browning]

Florian Weimer <address@hidden> writes:

> Git does not record the branch on which a commit was made.  It's
> sometimes recorded in merges, but only in the free-text commit
> message.  For fast-forward merges (without a separate merge commit),
> there is no trace that development of certain commits happened on a
> separate branch.

And as an aside, it can sometimes be useful to preserve the information
that "these commits go together", even when git could just tack the
commits on to the end of the branch (which it will, when possible, by
default, i.e. a fast-forward merge).  To prevent that you can specify
"merge --no-ff", which will force git to create a merge commit.

So you'd end up with something like this (on, say master):

   * merge commit to add new thing (master)
   |\
   | * third bit of thing
   | |
   | * second bit of thing
   | |
   | * first bit of thing
   |/
   * last commit on master before merging new thing with --no-ff
   |

instead of this (without --no-ff):

   * third bit of thing (master)
   |
   * second bit of thing
   |
   * first bit of thing
   |
   * last commit on master before merging new thing with --no-ff
   |

-- 
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4