Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-recur: do not die unnecessarily | Johannes Schindelin | 2006-08-09 | 1 | -2/+4 |
* | merge-recur: try to merge older merge bases first | Johannes Schindelin | 2006-08-09 | 1 | -1/+12 |
* | merge-recur: if there is no common ancestor, fake empty one | Johannes Schindelin | 2006-08-09 | 1 | -0/+12 |
* | merge-recur: do not setenv("GIT_INDEX_FILE") | Johannes Schindelin | 2006-08-09 | 1 | -13/+9 |
* | merge-recur: do not call git-write-tree | Johannes Schindelin | 2006-08-09 | 1 | -24/+20 |
* | merge-recursive: fix rename handling | Johannes Schindelin | 2006-08-04 | 1 | -2/+4 |
* | .gitignore: git-merge-recur is a built file. | Junio C Hamano | 2006-08-03 | 2 | -1/+2 |
* | merge-recur: virtual commits shall never be parsed | Johannes Schindelin | 2006-07-31 | 1 | -0/+2 |
* | merge-recur: use the unpack_trees() interface instead of exec()ing read-tree | Johannes Schindelin | 2006-07-30 | 1 | -28/+52 |
* | Merge branch 'js/read-tree' into js/c-merge-recursive | Junio C Hamano | 2006-07-30 | 103 | -1668/+2902 |
|\ | |||||
| * | read-tree: move merge functions to the library | Johannes Schindelin | 2006-07-30 | 3 | -397/+410 |
| * | read-trees: refactor the unpack_trees() part | Johannes Schindelin | 2006-07-30 | 4 | -485/+521 |
| * | tar-tree: illustrate an obscure feature better | Johannes Schindelin | 2006-07-30 | 1 | -0/+5 |
| * | git.c: allow alias expansion without a git directory | Matthias Lederhofer | 2006-07-30 | 1 | -40/+36 |
| * | setup_git_directory_gently: do not barf when GIT_DIR is given. | Matthias Lederhofer | 2006-07-30 | 1 | -0/+4 |
| * | Build on Debian GNU/kFreeBSD | Gerrit Pape | 2006-07-30 | 1 | -0/+3 |
| * | Merge branch 'lt/web' | Junio C Hamano | 2006-07-30 | 1 | -2/+75 |
| |\ | |||||
| | * | gitweb.cgi: git_blame2: slight optimization reading the blame lines | Luben Tuikov | 2006-07-24 | 1 | -14/+5 |
| | * | gitweb.cgi: git_blame2: Revision blocks now have alternating colors | Luben Tuikov | 2006-07-24 | 1 | -4/+11 |
| | * | gitweb.cgi: git_blame2: Allow back-trekking through commits | Luben Tuikov | 2006-07-24 | 1 | -1/+7 |
| | * | gitweb.cgi: git_blame2: an alternative simple working git blame | Luben Tuikov | 2006-07-24 | 1 | -1/+70 |
| * | | Merge branch '__/setup-n-mv' | Junio C Hamano | 2006-07-30 | 40 | -156/+142 |
| |\ \ | |||||
| | * \ | Merge branch 'lt/setup' into __/setup-n-mv | Junio C Hamano | 2006-07-29 | 60 | -326/+585 |
| | |\ \ | |||||
| | | * | | Call setup_git_directory() much earlier | Linus Torvalds | 2006-07-29 | 35 | -144/+128 |
| | | * | | Call setup_git_directory() early | Linus Torvalds | 2006-07-28 | 12 | -22/+25 |
| * | | | | Merge branch 'js/mv' | Junio C Hamano | 2006-07-30 | 11 | -340/+522 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | builtin git-mv: support moving directories | Johannes Schindelin | 2006-07-26 | 2 | -5/+86 |
| | * | | | Make git-mv a builtin | Johannes Schindelin | 2006-07-26 | 8 | -295/+269 |
| | * | | | Extract helper bits from c-merge-recursive work | Johannes Schindelin | 2006-07-26 | 4 | -45/+172 |
| * | | | | Merge branch 'jn/make' | Junio C Hamano | 2006-07-30 | 5 | -0/+225 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Set datarootdir in config.mak.in | Pavel Roskin | 2006-07-14 | 1 | -0/+1 |
| | * | | | Quote all calls to GIT_CONF_APPEND_LINE | Pavel Roskin | 2006-07-14 | 1 | -12/+12 |
| | * | | | Typofix in configure.ac comment. | Pavel Roskin | 2006-07-09 | 1 | -1/+1 |
| | * | | | configure.ac vertical whitespace usage cleanup | Jakub Narebski | 2006-07-09 | 1 | -14/+15 |
| | * | | | autoconf: Checks for some programs | Jakub Narebski | 2006-07-09 | 2 | -0/+12 |
| | * | | | autoconf: Checks for libraries | Jakub Narebski | 2006-07-09 | 1 | -7/+21 |
| | * | | | autoconf: Checks for some library functions. | Jakub Narebski | 2006-07-09 | 1 | -3/+12 |
| | * | | | autoconf: Checks for typedefs, structures, and compiler characteristics. | Jakub Narebski | 2006-07-09 | 1 | -2/+13 |
| | * | | | autoconf: Preparing the way for autodetection | Jakub Narebski | 2006-07-09 | 1 | -1/+16 |
| | * | | | Copy description of build configuration variables to configure.ac | Jakub Narebski | 2006-07-09 | 1 | -1/+113 |
| | * | | | Teach make clean about configure and autoconf | Jakub Narebski | 2006-07-08 | 1 | -0/+2 |
| | * | | | autoconf: Use autoconf to write installation directories to config.mak.autogen | Jakub Narebski | 2006-07-02 | 5 | -0/+48 |
| * | | | | Display an error from update-ref if target ref name is invalid. | Shawn Pearce | 2006-07-28 | 2 | -0/+17 |
| * | | | | Fix http-fetch | Johannes Schindelin | 2006-07-28 | 1 | -3/+3 |
| * | | | | Merge branch 'pb/multi-fetch' | Junio C Hamano | 2006-07-28 | 7 | -72/+162 |
| |\ \ \ \ | |||||
| | * | | | | Teach git-http-fetch the --stdin switch | Petr Baudis | 2006-07-27 | 2 | -17/+36 |
| | * | | | | Teach git-local-fetch the --stdin switch | Petr Baudis | 2006-07-27 | 4 | -10/+74 |
| | * | | | | Make pull() support fetching multiple targets at once | Petr Baudis | 2006-07-27 | 5 | -37/+49 |
| | * | | | | Make pull() take some implicit data as explicit arguments | Petr Baudis | 2006-07-27 | 5 | -17/+12 |
| * | | | | | Merge branch 'lt/web' | Junio C Hamano | 2006-07-28 | 1 | -28/+55 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | |