kernel/git - git - PowerEL Git System

Tree: ec688f776c

Author	SHA1	Message	Date
Raman Gupta	ad53bf79aa	contrib/rerere-train: optionally overwrite existing resolutions Provide the user an option to overwrite existing resolutions using an `--overwrite` flag. This might be used, for example, if the user knows that they already have an entry in their rerere cache for a conflict, but wish to drop it and retrain based on the merge commit(s) passed to the rerere-train script. Signed-off-by: Raman Gupta <rocketraman@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	8 years ago
Daniel Knittl-Frank	4573a68e9b	Escape Git's exec path in contrib/rerere-train.sh script Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Jeff King <peff@peff.net>	9 years ago
Junio C Hamano	53876fcf3f	contrib/rerere-train: use installed git-sh-setup Instead of sourcing git-sh-setup from random place that is on the $PATH, explicitly source $(git --exec-path)/git-sh-setup. As I do not personally have any libexec/git-core directory on my $PATH like many other people, the script will fail without this update. Signed-off-by: Junio C Hamano <gitster@pobox.com>	13 years ago
Nanako Shiraishi	c11c7a5db3	Add contrib/rerere-train script This script takes a range of commits (e.g. maint..next) as its arguments, recreates merge commits in the range to prime rr-cache database. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	17 years ago