development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-20 00:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
18857 commits 6 branches 952 tags 534 MiB
Commit graph

54 commits

Author SHA1 Message Date
Junio C Hamano c2d5036de5 git-apply: retire unused/unimplemented --no-merge flag. 
The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-10-04 17:04:44 -07:00
Sergey Vlasov a7154e916c [PATCH] Documentation: Update all files to use the new gitlink: macro 
The replacement was performed automatically by these commands:

	perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \
		README Documentation/*.txt
	perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \
		README Documentation/*.txt

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-20 15:07:52 -07:00
Junio C Hamano 12dd6e8cb0 [PATCH] apply: match documentation, usage string and code. 
The more recent --apply option was not described.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2005-07-13 20:53:33 -07:00
Junio C Hamano d0587fd59f [PATCH] git-apply: documentation. 
Add missing documentation for git-apply.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2005-06-22 10:23:48 -07:00