kernel/git - git - PowerEL Git System

146 Commits

6 Branches

36 Tags

131 MiB

Tree: 3b7d368f34

Commit Graph

Author	SHA1	Message	Date
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

Author

SHA1

Message

Date

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

3 Commits (3b7d368f34715003c834233d9f23456bcb62b44a)