summaryrefslogtreecommitdiff
path: root/merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* make "merge-index" a built-inLinus Torvalds2010-01-221-114/+0
* Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt2009-06-091-29/+13
* Replace deprecated dashed git commands in usageAlexander Potashev2009-02-041-1/+1
* Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska2009-01-261-0/+3
* 'git foo' program identifies itself without dash in die() messagesJunio C Hamano2008-08-311-3/+3
* git-merge-index documentation: clarify synopsisGerrit Pape2008-02-221-1/+1
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-1/+1
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* Fix merge-indexJunio C Hamano2007-03-191-1/+2
* Use run_command within merge-indexShawn O. Pearce2007-03-121-18/+5
* merge-index: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
* simplify inclusion of system header files.Junio C Hamano2006-12-201-4/+0
* remove unnecessary initializationsDavid Rientjes2006-08-151-1/+1
* use appropriate typedefsDavid Rientjes2006-08-151-1/+2
* Solaris needs inclusion of signal.h for signal()Dennis Stosberg2006-06-261-0/+1
* Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano2006-06-191-0/+5
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-281-0/+1
* Big tool rename.Junio C Hamano2005-09-071-0/+135
View Lorry Controller Status