aboutsummaryrefslogtreecommitdiff
path: root/merge-index.c
Commit message (Expand)AuthorAge
* make "merge-index" a built-inLinus Torvalds2010-01-22
* Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt2009-06-09
* Replace deprecated dashed git commands in usageAlexander Potashev2009-02-04
* Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska2009-01-26
* 'git foo' program identifies itself without dash in die() messagesJunio C Hamano2008-08-31
* git-merge-index documentation: clarify synopsisGerrit Pape2008-02-22
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
* War on whitespaceJunio C Hamano2007-06-07
* Fix merge-indexJunio C Hamano2007-03-19
* Use run_command within merge-indexShawn O. Pearce2007-03-12
* merge-index: fix longstanding bug in merging symlinksJunio C Hamano2007-02-25
* simplify inclusion of system header files.Junio C Hamano2006-12-20
* remove unnecessary initializationsDavid Rientjes2006-08-15
* use appropriate typedefsDavid Rientjes2006-08-15
* Solaris needs inclusion of signal.h for signal()Dennis Stosberg2006-06-26
* Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano2006-06-19
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-28
* Big tool rename.Junio C Hamano2005-09-07