kernel/git - git - PowerEL Git System

Tree: 13019d4136

Author	SHA1	Message	Date
Linus Torvalds	705acc5c94	git-pull-script: add a final "diffstat" to show the result of the merge. This is useful to verify that you got the right thing.	20 years ago
Linus Torvalds	2d280e1c5e	Update the merge scripts for the big git rename. Let's see what else I forgot..	20 years ago
Rene Scharfe	d840b3b285	[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-script If you set SHA1_FILE_DIRECTORY to something else than .git/objects git-pull-script will store the fetched files in a location the rest of the tools does not expect. git-prune-script also ignores this setting, but I think this is good, because pruning a shared tree to fit a single project means throwing away a lot of useful data. :-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	9831d8f860	git-pull-script: do automatic merges When the trivial "read-tree" merge fails, fall back on the (equally trivial) automatic merge script instead of forcing the user to do it by hand. When _that_ fails, you get to do a manual merge.	20 years ago
Linus Torvalds	8ccfbf3279	Update "git-pull-script" to use "read-tree -m" for reading a single tree too. That should speed up a trivial merge noticeably. Also, don't bother reading back the tree we just wrote when we committed a real merge. It had better be the same one we still have..	20 years ago
Linus Torvalds	4aaef1064a	Make git-pull-script do the right thing for symlinked HEAD's. Also exit gracefully if the HEAD pull failed, rather than use a possibly stale MERGE_HEAD.	20 years ago
Junio C Hamano	0ffb0bcaf6	[PATCH] Do not let rsync obliterate .git/object symbolic link. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	00829b5def	Add "update-cache --refresh" to git-pull-script to make sure out index is all ready to go after a pull. Noted by Russell King	20 years ago
Linus Torvalds	839a7a06f3	Add the simple scripts I used to do a merge with content conflicts. They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.	20 years ago