summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-098-153/+102
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-097-39/+52
* Add 'const' where appropriate to index handling functionsLinus Torvalds2008-03-094-16/+16
* Fix tree-walking compare_entry() in the presense of --prefixLinus Torvalds2008-03-091-0/+3
* Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-091-281/+249
* Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds2008-03-093-4/+9
* Add return value to 'traverse_tree()' callbackLinus Torvalds2008-03-093-13/+22
* Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds2008-03-093-28/+78
* Add 'df_name_compare()' helper functionLinus Torvalds2008-03-092-0/+36
* Add a test for read-tree -u --reset with a D/F conflictJeff King2008-03-081-0/+30
* Merge branch 'ph/parseopt'Junio C Hamano2008-03-086-23/+68
|\
| * parse-options: new option type to treat an option-like parameter as an argument.Pierre Habouzit2008-03-024-7/+39
| * parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseoptPierre Habouzit2008-03-022-16/+29
* | Merge branch 'dp/clean-fix'Junio C Hamano2008-03-0811-94/+123
|\ \
| * | git-clean: add tests for relative pathJunio C Hamano2008-03-071-0/+52
| * | git-clean: correct printing relative pathDmitry Potapov2008-03-071-18/+14
| * | Make private quote_path() in wt-status.c available as quote_path_relative()Dmitry Potapov2008-03-073-45/+48
| * | Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths...Junio C Hamano2008-03-071-10/+1
| * | Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)Junio C Hamano2008-03-071-12/+0
| * | Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)Junio C Hamano2008-03-071-5/+1
| * | get_pathspec(): die when an out-of-tree path is givenJunio C Hamano2008-03-073-4/+7
* | | Merge branch 'ml/submodule-add-existing'Junio C Hamano2008-03-082-22/+33
|\ \ \
| * | | git-submodule - Allow adding a submodule in-placeMark Levedahl2008-03-052-22/+33
* | | | Merge branch 'mr/compat-snprintf'Junio C Hamano2008-03-085-0/+92
|\ \ \ \
| * | | | Add compat/snprintf.c for systems that return bogusMichal Rokos2008-03-055-0/+92
| | |/ / | |/| |
* | | | Merge branch 'sp/fetch-optim'Junio C Hamano2008-03-0811-24/+338
|\ \ \ \
| * | | | Teach git-fetch to exploit server side automatic tag followingShawn O. Pearce2008-03-044-0/+37
| * | | | Teach fetch-pack/upload-pack about --include-tagShawn O. Pearce2008-03-044-6/+24
| * | | | git-pack-objects: Automatically pack annotated tags if object was packedShawn O. Pearce2008-03-043-2/+111
| * | | | Teach git-fetch to grab a tag at the same time as a commitShawn O. Pearce2008-03-032-1/+137
| * | | | Make git-fetch follow tags we already have objects for soonerShawn O. Pearce2008-03-031-0/+6
| * | | | Teach upload-pack to log the received need lines to an fdShawn O. Pearce2008-03-031-0/+9
| * | | | Free the path_lists used to find non-local tags in git-fetchShawn O. Pearce2008-03-031-1/+3
| * | | | Allow builtin-fetch's find_non_local_tags to append onto a listShawn O. Pearce2008-03-031-8/+8
| * | | | Ensure tail pointer gets setup correctly when we fetch HEAD onlyShawn O. Pearce2008-03-031-0/+1
| * | | | Remove unnecessary delaying of free_refs(ref_map) in builtin-fetchShawn O. Pearce2008-03-031-5/+2
| * | | | Remove unused variable in builtin-fetch find_non_local_tagsShawn O. Pearce2008-03-031-3/+2
* | | | | Merge branch 'jc/describe-always'Junio C Hamano2008-03-082-32/+44
|\ \ \ \ \
| * | | | | describe --always: fall back to showing an abbreviated object nameJunio C Hamano2008-03-032-32/+44
* | | | | | Merge branch 'jc/am'Junio C Hamano2008-03-085-16/+118
|\ \ \ \ \ \
| * | | | | | am: --rebasingJunio C Hamano2008-03-053-4/+21
| * | | | | | am: remove support for -d .dotestJunio C Hamano2008-03-052-14/+6
| * | | | | | am: read from the right mailbox when started from a subdirectoryJunio C Hamano2008-03-052-2/+95
* | | | | | | Merge branch 'cr/reset-parseopt'Junio C Hamano2008-03-081-27/+20
|\ \ \ \ \ \ \
| * | | | | | | Make builtin-reset.c use parse_options.Carlos Rica2008-03-051-27/+20
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/gitweb-pickaxe'Junio C Hamano2008-03-081-42/+43
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Fix and simplify pickaxe searchJakub Narebski2008-03-051-42/+43
| |/ / / / / /
* | | | | | | Merge branch 'kb/maint-filter-branch-disappear'Junio C Hamano2008-03-082-1/+34
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: handle "disappearing tree" case correctly in subdir filterJunio C Hamano2008-03-082-1/+34
* | | | | | | | Merge branch 'maint' to sync with 1.5.4.4Junio C Hamano2008-03-087-14/+39
|\ \ \ \ \ \ \ \
View Lorry Controller Status