Sign in
googlers
/
jrn
/
git
/
5d6f0935e6df017fcc446e348aebf4da2d210a27
/
merge-index.c
96f1e58
remove unnecessary initializations
by David Rientjes
· 19 years ago
6f002f9
use appropriate typedefs
by David Rientjes
· 19 years ago
e898081
Solaris needs inclusion of signal.h for signal()
by Dennis Stosberg
· 19 years ago
f0b7367
Restore SIGCHLD to SIG_DFL where we care about waitpid().
by Junio C Hamano
· 19 years ago
53228a5
Make the rest of commands work from a subdirectory.
by Junio C Hamano
· 19 years ago
215a7ad
Big tool rename.
by Junio C Hamano
· 20 years ago
[Renamed (91%) from merge-cache.c]
b32e986
[PATCH] Fix git-merge-cache -q
by Petr Baudis
· 20 years ago
bbd14cb
[PATCH] git-merge-cache -q doesn't complain about failing merge program
by Petr Baudis
· 20 years ago
667bb59
[PATCH] cleanup of in-code names
by Alexey Nezhdanov
· 20 years ago
2a45925
git-merge-cache -o does all the automerges in a single shot
by Petr Baudis
· 20 years ago
8c59926
Make merge-cache not fail immediatelly when the merge program
by Petr Baudis
· 20 years ago
e2b6a9d
[PATCH] make file merging respect permissions
by James Bottomley
· 20 years ago
e3b4be7
Change merge-cache and git-merge-one-file to use the SHA1 of the file
by Linus Torvalds
· 20 years ago
75118b1
Ass a "merge-cache" helper program to execute a merge on any unmerged files.
by Linus Torvalds
· 20 years ago