summaryrefslogtreecommitdiff
path: root/merge-index.c
AgeCommit message (Expand)Author
2010-01-22make "merge-index" a built-inLinus Torvalds
2009-06-09Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev
2009-01-26Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska
2008-08-31'git foo' program identifies itself without dash in die() messagesJunio C Hamano
2008-02-22git-merge-index documentation: clarify synopsisGerrit Pape
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds
2007-06-07War on whitespaceJunio C Hamano
2007-03-19Fix merge-indexJunio C Hamano
2007-03-13Use run_command within merge-indexShawn O. Pearce
2007-02-26merge-index: fix longstanding bug in merging symlinksJunio C Hamano
2006-12-20simplify inclusion of system header files.Junio C Hamano
2006-08-16remove unnecessary initializationsDavid Rientjes
2006-08-15use appropriate typedefsDavid Rientjes
2006-06-26Solaris needs inclusion of signal.h for signal()Dennis Stosberg
2006-06-20Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano
2005-11-29Make the rest of commands work from a subdirectory.Junio C Hamano
2005-09-08Big tool rename.Junio C Hamano