[ANNOUNCE] GIT 1.2.1

The latest maintenance release GIT 1.2.1 is available at the usual places:

	http://www.kernel.org/pub/software/scm/git/

	git-1.2.1.tar.{gz,bz2}			(tarball)
	RPMS/$arch/git-*-1.2.1-1.$arch.rpm	(RPM)

Nothing earth-shattering but cleanups and cleanups and cleanups.

All the interesting things are happening in "master" and "pu", which will be a topic for a separate message.

----------------------------------------------------------------

Changes since v1.2.0 are as follows:

Fernando J. Pereda:
      Print an error if cloning a http repo and NO_CURL is set

Fredrik Kuivinen:
      s/SHELL/SHELL_PATH/ in Makefile

Josef Weidendorfer:
      More useful/hinting error messages in git-checkout

Junio C Hamano:
      Documentation: git-commit in 1.2.X series defaults to --include.
      Documentation: git-ls-files asciidocco.
      bisect: remove BISECT_NAMES after done.
      combine-diff: diff-files fix.
      combine-diff: diff-files fix (#2)
      checkout: fix dirty-file display.

*sigh*

I got confused about git pull origin and git pull master.

Tutorial seems to tell me I should have said git pull origin and left well enough alone.

Now I get:

fatal: you need to resolve your current index first

How do I do that?

TIA.

Michael

Michael Fischer wrote:

If you just want to clean the index so you can pull from origin again, you should be able to just do

	$ git reset --hard origin

If you've got local changes that has caused conflicts in the index you need to fix that up first and commit them.