aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Add a test for read-tree -u --reset with a D/F conflictJeff King2008-03-08
* Merge branch 'ph/parseopt'Junio C Hamano2008-03-08
|\
| * parse-options: new option type to treat an option-like parameter as an argument.Pierre Habouzit2008-03-02
| * parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseoptPierre Habouzit2008-03-02
* | Merge branch 'dp/clean-fix'Junio C Hamano2008-03-08
|\ \
| * | git-clean: add tests for relative pathJunio C Hamano2008-03-07
| * | git-clean: correct printing relative pathDmitry Potapov2008-03-07
| * | Make private quote_path() in wt-status.c available as quote_path_relative()Dmitry Potapov2008-03-07
| * | Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths...Junio C Hamano2008-03-07
| * | Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)Junio C Hamano2008-03-07
| * | Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)Junio C Hamano2008-03-07
| * | get_pathspec(): die when an out-of-tree path is givenJunio C Hamano2008-03-07
* | | Merge branch 'ml/submodule-add-existing'Junio C Hamano2008-03-08
|\ \ \
| * | | git-submodule - Allow adding a submodule in-placeMark Levedahl2008-03-05
* | | | Merge branch 'mr/compat-snprintf'Junio C Hamano2008-03-08
|\ \ \ \
| * | | | Add compat/snprintf.c for systems that return bogusMichal Rokos2008-03-05
| | |/ / | |/| |
* | | | Merge branch 'sp/fetch-optim'Junio C Hamano2008-03-08
|\ \ \ \
| * | | | Teach git-fetch to exploit server side automatic tag followingShawn O. Pearce2008-03-04
| * | | | Teach fetch-pack/upload-pack about --include-tagShawn O. Pearce2008-03-04
| * | | | git-pack-objects: Automatically pack annotated tags if object was packedShawn O. Pearce2008-03-04
| * | | | Teach git-fetch to grab a tag at the same time as a commitShawn O. Pearce2008-03-03
| * | | | Make git-fetch follow tags we already have objects for soonerShawn O. Pearce2008-03-03
| * | | | Teach upload-pack to log the received need lines to an fdShawn O. Pearce2008-03-03
| * | | | Free the path_lists used to find non-local tags in git-fetchShawn O. Pearce2008-03-03
| * | | | Allow builtin-fetch's find_non_local_tags to append onto a listShawn O. Pearce2008-03-03
| * | | | Ensure tail pointer gets setup correctly when we fetch HEAD onlyShawn O. Pearce2008-03-03
| * | | | Remove unnecessary delaying of free_refs(ref_map) in builtin-fetchShawn O. Pearce2008-03-03
| * | | | Remove unused variable in builtin-fetch find_non_local_tagsShawn O. Pearce2008-03-03
* | | | | Merge branch 'jc/describe-always'Junio C Hamano2008-03-08
|\ \ \ \ \
| * | | | | describe --always: fall back to showing an abbreviated object nameJunio C Hamano2008-03-03
* | | | | | Merge branch 'jc/am'Junio C Hamano2008-03-08
|\ \ \ \ \ \
| * | | | | | am: --rebasingJunio C Hamano2008-03-05
| * | | | | | am: remove support for -d .dotestJunio C Hamano2008-03-05
| * | | | | | am: read from the right mailbox when started from a subdirectoryJunio C Hamano2008-03-05
* | | | | | | Merge branch 'cr/reset-parseopt'Junio C Hamano2008-03-08
|\ \ \ \ \ \ \
| * | | | | | | Make builtin-reset.c use parse_options.Carlos Rica2008-03-05
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/gitweb-pickaxe'Junio C Hamano2008-03-08
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Fix and simplify pickaxe searchJakub Narebski2008-03-05
| |/ / / / / /
* | | | | | | Merge branch 'kb/maint-filter-branch-disappear'Junio C Hamano2008-03-08
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: handle "disappearing tree" case correctly in subdir filterJunio C Hamano2008-03-08
* | | | | | | | Merge branch 'maint' to sync with 1.5.4.4Junio C Hamano2008-03-08
|\ \ \ \ \ \ \ \
| * | | | | | | | GIT 1.5.4.4v1.5.4.4Junio C Hamano2008-03-08
| * | | | | | | | ident.c: reword error message when the user name cannot be determinedSanti Béjar2008-03-08
| * | | | | | | | Fix dcommit, rebase when rewriteRoot is in useJohn Goerzen2008-03-08
| * | | | | | | | Really make the LF after reset in fast-import optionalAdeodato Simó2008-03-08
| * | | | | | | | Merge branch 'mh/maint-http-proxy-fix' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/maint-daemon' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-cvsexport' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-log-merge-left-right' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/maint-svn-cert-fileprovider' into maintJunio C Hamano2008-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |