summaryrefslogtreecommitdiff
path: root/merge-index.c
AgeCommit message (Expand)AuthorFilesLines
2008-02-22git-merge-index documentation: clarify synopsisLibravatar Gerrit Pape1-1/+1
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+1
2007-03-19Fix merge-indexLibravatar Junio C Hamano1-1/+2
2007-03-12Use run_command within merge-indexLibravatar Shawn O. Pearce1-18/+5
2007-02-25merge-index: fix longstanding bug in merging symlinksLibravatar Junio C Hamano1-1/+1
2006-12-20simplify inclusion of system header files.Libravatar Junio C Hamano1-4/+0
2006-08-15remove unnecessary initializationsLibravatar David Rientjes1-1/+1
2006-08-15use appropriate typedefsLibravatar David Rientjes1-1/+2
2006-06-26Solaris needs inclusion of signal.h for signal()Libravatar Dennis Stosberg1-0/+1
2006-06-19Restore SIGCHLD to SIG_DFL where we care about waitpid().Libravatar Junio C Hamano1-0/+5
2005-11-28Make the rest of commands work from a subdirectory.Libravatar Junio C Hamano1-0/+1
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+135