kernel/git - git - PowerEL Git System

Tree: 475443c848

Author	SHA1	Message	Date
Eric Wong	687b8be8bb	fetch,parse-remote,fmt-merge-msg: refs/remotes/* support We can now easily fetch and merge things from heads in the refs/remotes/ hierarchy in remote repositories. The refs/remotes/ hierarchy is likely to become the standard for tracking foreign SCMs, as well as the location of Pull: targets for tracking remote branches in newly cloned repositories. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Linus Torvalds	bbe60241ae	git-fmt-merge-msg cleanup Since I've started using the "merge.summary" flag in my repo, my merge messages look nicer, but I dislike how I get notifications of merges within merges. So I'd suggest this trivial change.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alex Riesen	a92c73eccc	PATCH: simplify calls to git programs in git-fmt-merge-msg It also makes it work on ActiveState Perl. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	d37a1ed7f2	Fix fmt-merge-msg counting. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	2a86ec46da	fmt-merge-msg: avoid open "-\|" list form for Perl 5.6 Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	a15f43312f	fmt-merge-msg: do not add excess newline at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	2b020455f9	fmt-merge-msg: say which branch things were merged into unless 'master' Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	1cb303872a	fmt-merge-msg: show summary of what is merged. In addition to the branch names, populate the log message with one-line description from actual commits that are being merged. This was prompted by Len's 12-way octopus. You need to have 'merge.summary' in the configuration file to enable it: $ git repo-config merge.summary yes Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	05dd8e2ee2	Fix default pull not to do an unintended Octopus. 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>	20 years ago
Junio C Hamano	c8b48ba476	Prettyprint octopus merge message. 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>	20 years ago