11 Commits (3023dc690f98f83b64cc6f2a9cc015bf2b01964a)

Author SHA1 Message Date
Junio C Hamano a6080a0a44 War on whitespace 18 years ago
Junio C Hamano 843d49a479 Fix merge-index 18 years ago
Shawn O. Pearce b49809c961 Use run_command within merge-index 18 years ago
Junio C Hamano 308efc10d8 merge-index: fix longstanding bug in merging symlinks 18 years ago
Junio C Hamano 85023577a8 simplify inclusion of system header files. 18 years ago
David Rientjes 96f1e58f52 remove unnecessary initializations 19 years ago
David Rientjes 6f002f984f use appropriate typedefs 19 years ago
Dennis Stosberg e898081dfb Solaris needs inclusion of signal.h for signal() 19 years ago
Junio C Hamano f0b7367cb1 Restore SIGCHLD to SIG_DFL where we care about waitpid(). 19 years ago
Junio C Hamano 53228a5fb8 Make the rest of commands work from a subdirectory. 19 years ago
Junio C Hamano 215a7ad1ef Big tool rename. 20 years ago
Petr Baudis b32e986cd7 [PATCH] Fix git-merge-cache -q 20 years ago
Petr Baudis bbd14cb011 [PATCH] git-merge-cache -q doesn't complain about failing merge program 20 years ago
Alexey Nezhdanov 667bb59b2d [PATCH] cleanup of in-code names 20 years ago
Petr Baudis 2a45925180 git-merge-cache -o does all the automerges in a single shot 20 years ago
Petr Baudis 8c59926f5e Make merge-cache not fail immediatelly when the merge program 20 years ago
James Bottomley e2b6a9d0bf [PATCH] make file merging respect permissions 20 years ago
Linus Torvalds e3b4be7f6c Change merge-cache and git-merge-one-file to use the SHA1 of the file 20 years ago
Linus Torvalds 75118b13bc Ass a "merge-cache" helper program to execute a merge on 20 years ago