org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	git-pull: do not barf on -a flag meant for git-fetch.	Junio C Hamano	2005-10-03
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Use git-merge in git-pull (second try).	Junio C Hamano	2005-09-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if given, is passed to git-merge to prevent it from running the diffstat at the end of the merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Use git-update-ref in scripts.	Junio C Hamano	2005-09-28
\| \| \| \| \| \| \| \| \|	This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Fix default pull not to do an unintended Octopus.	Junio C Hamano	2005-09-28
\| \| \| \| \| \| \| \| \| \| \| \|	The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Prettyprint octopus merge message.	Junio C Hamano	2005-09-22
\| \| \| \| \| \| \| \|	Including the current branch in the list of heads being merged was not a good idea, so drop it. And shorten the message by grouping branches and tags together to form a single line. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Revert "Use git-merge instead of git-resolve in git-pull."	Junio C Hamano	2005-09-21
\| \| \| \|	This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
*	Revert "Make Octopus merge message a bit nicer."	Junio C Hamano	2005-09-21
\| \| \| \|	This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.
*	Make Octopus merge message a bit nicer.	Junio C Hamano	2005-09-20
\| \| \| \| \| \| \|	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>
*	Use git-merge instead of git-resolve in git-pull.	Junio C Hamano	2005-09-20
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.	Junio C Hamano	2005-09-15
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Make merge comment git-pull makes for an octopus a bit prettier.	Junio C Hamano	2005-09-13
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Big tool rename.	Junio C Hamano	2005-09-07
	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>