summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin2006-08-091-0/+12
* merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin2006-08-091-13/+9
* merge-recur: do not call git-write-treeJohannes Schindelin2006-08-091-24/+20
* merge-recursive: fix rename handlingJohannes Schindelin2006-08-041-2/+4
* .gitignore: git-merge-recur is a built file.Junio C Hamano2006-08-042-1/+2
* merge-recur: virtual commits shall never be parsedJohannes Schindelin2006-08-011-0/+2
* merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin2006-07-311-28/+52
* Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-31103-1668/+2902
|\
| * read-tree: move merge functions to the libraryJohannes Schindelin2006-07-313-397/+410
| * read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-314-485/+521
| * tar-tree: illustrate an obscure feature betterJohannes Schindelin2006-07-311-0/+5
| * git.c: allow alias expansion without a git directoryMatthias Lederhofer2006-07-311-40/+36
| * setup_git_directory_gently: do not barf when GIT_DIR is given.Matthias Lederhofer2006-07-311-0/+4
| * Build on Debian GNU/kFreeBSDGerrit Pape2006-07-301-0/+3
| * Merge branch 'lt/web'Junio C Hamano2006-07-301-2/+75
| |\
| | * gitweb.cgi: git_blame2: slight optimization reading the blame linesLuben Tuikov2006-07-251-14/+5
| | * gitweb.cgi: git_blame2: Revision blocks now have alternating colorsLuben Tuikov2006-07-251-4/+11
| | * gitweb.cgi: git_blame2: Allow back-trekking through commitsLuben Tuikov2006-07-251-1/+7
| | * gitweb.cgi: git_blame2: an alternative simple working git blameLuben Tuikov2006-07-251-1/+70
| * | Merge branch '__/setup-n-mv'Junio C Hamano2006-07-3040-156/+142
| |\ \
| | * \ Merge branch 'lt/setup' into __/setup-n-mvJunio C Hamano2006-07-2960-326/+585
| | |\ \
| | | * | Call setup_git_directory() much earlierLinus Torvalds2006-07-2935-144/+128
| | | * | Call setup_git_directory() earlyLinus Torvalds2006-07-2912-22/+25
| * | | | Merge branch 'js/mv'Junio C Hamano2006-07-3011-340/+522
| |\| | |
| | * | | builtin git-mv: support moving directoriesJohannes Schindelin2006-07-262-5/+86
| | * | | Make git-mv a builtinJohannes Schindelin2006-07-268-295/+269
| | * | | Extract helper bits from c-merge-recursive workJohannes Schindelin2006-07-264-45/+172
| * | | | Merge branch 'jn/make'Junio C Hamano2006-07-305-0/+225
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Set datarootdir in config.mak.inPavel Roskin2006-07-151-0/+1
| | * | | Quote all calls to GIT_CONF_APPEND_LINEPavel Roskin2006-07-151-12/+12
| | * | | Typofix in configure.ac comment.Pavel Roskin2006-07-091-1/+1
| | * | | configure.ac vertical whitespace usage cleanupJakub Narebski2006-07-091-14/+15
| | * | | autoconf: Checks for some programsJakub Narebski2006-07-092-0/+12
| | * | | autoconf: Checks for librariesJakub Narebski2006-07-091-7/+21
| | * | | autoconf: Checks for some library functions.Jakub Narebski2006-07-091-3/+12
| | * | | autoconf: Checks for typedefs, structures, and compiler characteristics.Jakub Narebski2006-07-091-2/+13
| | * | | autoconf: Preparing the way for autodetectionJakub Narebski2006-07-091-1/+16
| | * | | Copy description of build configuration variables to configure.acJakub Narebski2006-07-091-1/+113
| | * | | Teach make clean about configure and autoconfJakub Narebski2006-07-081-0/+2
| | * | | autoconf: Use autoconf to write installation directories to config.mak.autogenJakub Narebski2006-07-035-0/+48
| * | | | Display an error from update-ref if target ref name is invalid.Shawn Pearce2006-07-292-0/+17
| * | | | Fix http-fetchJohannes Schindelin2006-07-291-3/+3
| * | | | Merge branch 'pb/multi-fetch'Junio C Hamano2006-07-287-72/+162
| |\ \ \ \
| | * | | | Teach git-http-fetch the --stdin switchPetr Baudis2006-07-282-17/+36
| | * | | | Teach git-local-fetch the --stdin switchPetr Baudis2006-07-284-10/+74
| | * | | | Make pull() support fetching multiple targets at oncePetr Baudis2006-07-285-37/+49
| | * | | | Make pull() take some implicit data as explicit argumentsPetr Baudis2006-07-285-17/+12
| * | | | | Merge branch 'lt/web'Junio C Hamano2006-07-281-28/+55
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | gitweb.cgi: Centralize printing of the page pathLuben Tuikov2006-07-251-20/+21
| | * | | | gitweb.cgi: Show "raw" head of project link even when $hash is not definedLuben Tuikov2006-07-251-0/+3