Commit Graph

107 Commits

Author SHA1 Message Date
Junio C Hamano
acfadcfb48 Revert "Use git-merge instead of git-resolve in git-pull."
This reverts f887564ab7 commit.
2005-09-21 14:01:56 -07:00
Junio C Hamano
b91fb518cc Revert "Make Octopus merge message a bit nicer."
This reverts 63f1aa6c72 commit.
2005-09-21 13:59:54 -07:00
Junio C Hamano
63f1aa6c72 Make Octopus merge message a bit nicer.
Linus says that 'of .' to mean the commits came from the local repository
was too confusing and ugly -- I tend to agree with him.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-20 18:16:27 -07:00
Junio C Hamano
f887564ab7 Use git-merge instead of git-resolve in git-pull.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-20 18:16:27 -07:00
Junio C Hamano
b4416b432b Revert breakage introduced by c80522e30f.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15 17:38:26 -07:00
Junio C Hamano
c80522e30f Make merge comment git-pull makes for an octopus a bit prettier.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13 23:49:55 -07:00
Junio C Hamano
215a7ad1ef Big tool rename.
As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 17:45:20 -07:00