Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dp/clean-fix' | Junio C Hamano | 2008-03-08 | 11 | -94/+123 |
|\ | |||||
| * | git-clean: add tests for relative path | Junio C Hamano | 2008-03-07 | 1 | -0/+52 |
| * | git-clean: correct printing relative path | Dmitry Potapov | 2008-03-07 | 1 | -18/+14 |
| * | Make private quote_path() in wt-status.c available as quote_path_relative() | Dmitry Potapov | 2008-03-07 | 3 | -45/+48 |
| * | Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths... | Junio C Hamano | 2008-03-07 | 1 | -10/+1 |
| * | Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes) | Junio C Hamano | 2008-03-07 | 1 | -12/+0 |
| * | Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files) | Junio C Hamano | 2008-03-07 | 1 | -5/+1 |
| * | get_pathspec(): die when an out-of-tree path is given | Junio C Hamano | 2008-03-07 | 3 | -4/+7 |
* | | Merge branch 'ml/submodule-add-existing' | Junio C Hamano | 2008-03-08 | 2 | -22/+33 |
|\ \ | |||||
| * | | git-submodule - Allow adding a submodule in-place | Mark Levedahl | 2008-03-05 | 2 | -22/+33 |
* | | | Merge branch 'mr/compat-snprintf' | Junio C Hamano | 2008-03-08 | 5 | -0/+92 |
|\ \ \ | |||||
| * | | | Add compat/snprintf.c for systems that return bogus | Michal Rokos | 2008-03-05 | 5 | -0/+92 |
| | |/ | |/| | |||||
* | | | Merge branch 'sp/fetch-optim' | Junio C Hamano | 2008-03-08 | 11 | -24/+338 |
|\ \ \ | |||||
| * | | | Teach git-fetch to exploit server side automatic tag following | Shawn O. Pearce | 2008-03-04 | 4 | -0/+37 |
| * | | | Teach fetch-pack/upload-pack about --include-tag | Shawn O. Pearce | 2008-03-04 | 4 | -6/+24 |
| * | | | git-pack-objects: Automatically pack annotated tags if object was packed | Shawn O. Pearce | 2008-03-04 | 3 | -2/+111 |
| * | | | Teach git-fetch to grab a tag at the same time as a commit | Shawn O. Pearce | 2008-03-03 | 2 | -1/+137 |
| * | | | Make git-fetch follow tags we already have objects for sooner | Shawn O. Pearce | 2008-03-03 | 1 | -0/+6 |
| * | | | Teach upload-pack to log the received need lines to an fd | Shawn O. Pearce | 2008-03-03 | 1 | -0/+9 |
| * | | | Free the path_lists used to find non-local tags in git-fetch | Shawn O. Pearce | 2008-03-03 | 1 | -1/+3 |
| * | | | Allow builtin-fetch's find_non_local_tags to append onto a list | Shawn O. Pearce | 2008-03-03 | 1 | -8/+8 |
| * | | | Ensure tail pointer gets setup correctly when we fetch HEAD only | Shawn O. Pearce | 2008-03-03 | 1 | -0/+1 |
| * | | | Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch | Shawn O. Pearce | 2008-03-03 | 1 | -5/+2 |
| * | | | Remove unused variable in builtin-fetch find_non_local_tags | Shawn O. Pearce | 2008-03-03 | 1 | -3/+2 |
* | | | | Merge branch 'jc/describe-always' | Junio C Hamano | 2008-03-08 | 2 | -32/+44 |
|\ \ \ \ | |||||
| * | | | | describe --always: fall back to showing an abbreviated object name | Junio C Hamano | 2008-03-03 | 2 | -32/+44 |
* | | | | | Merge branch 'jc/am' | Junio C Hamano | 2008-03-08 | 5 | -16/+118 |
|\ \ \ \ \ | |||||
| * | | | | | am: --rebasing | Junio C Hamano | 2008-03-05 | 3 | -4/+21 |
| * | | | | | am: remove support for -d .dotest | Junio C Hamano | 2008-03-05 | 2 | -14/+6 |
| * | | | | | am: read from the right mailbox when started from a subdirectory | Junio C Hamano | 2008-03-05 | 2 | -2/+95 |
* | | | | | | Merge branch 'cr/reset-parseopt' | Junio C Hamano | 2008-03-08 | 1 | -27/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make builtin-reset.c use parse_options. | Carlos Rica | 2008-03-05 | 1 | -27/+20 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jn/gitweb-pickaxe' | Junio C Hamano | 2008-03-08 | 1 | -42/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: Fix and simplify pickaxe search | Jakub Narebski | 2008-03-05 | 1 | -42/+43 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'kb/maint-filter-branch-disappear' | Junio C Hamano | 2008-03-08 | 2 | -1/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | filter-branch: handle "disappearing tree" case correctly in subdir filter | Junio C Hamano | 2008-03-08 | 2 | -1/+34 |
* | | | | | | | Merge branch 'maint' to sync with 1.5.4.4 | Junio C Hamano | 2008-03-08 | 7 | -14/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GIT 1.5.4.4v1.5.4.4 | Junio C Hamano | 2008-03-08 | 2 | -7/+27 |
| * | | | | | | | ident.c: reword error message when the user name cannot be determined | Santi Béjar | 2008-03-08 | 1 | -1/+1 |
| * | | | | | | | Fix dcommit, rebase when rewriteRoot is in use | John Goerzen | 2008-03-08 | 1 | -1/+6 |
| * | | | | | | | Really make the LF after reset in fast-import optional | Adeodato Simó | 2008-03-08 | 2 | -1/+4 |
| * | | | | | | | Merge branch 'mh/maint-http-proxy-fix' into maint | Junio C Hamano | 2008-03-08 | 7 | -12/+22 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/maint-daemon' into maint | Junio C Hamano | 2008-03-08 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/maint-cvsexport' into maint | Junio C Hamano | 2008-03-08 | 2 | -8/+67 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-log-merge-left-right' into maint | Junio C Hamano | 2008-03-08 | 1 | -8/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/maint-svn-cert-fileprovider' into maint | Junio C Hamano | 2008-03-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | merge-tool documentation: describe custom command usage | Charles Bailey | 2008-03-08 | 1 | -0/+22 |
* | | | | | | | | | | | | git-mergetool documentaiton: show toolnames in typewriter font | Charles Bailey | 2008-03-08 | 1 | -8/+8 |
* | | | | | | | | | | | | Merge branch 'aw/maint-shortlog-blank-lines' | Junio C Hamano | 2008-03-08 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | shortlog: take the first populated line of the description | Andy Whitcroft | 2008-03-05 | 1 | -2/+3 |