Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 8 | -23/+45 |
|\ | |||||
| * | read_sha1_file(): allow selective bypassing of replacement mechanism | Junio C Hamano | 2011-05-15 | 2 | -5/+12 |
| * | inline lookup_replace_object() calls | Junio C Hamano | 2011-05-15 | 3 | -4/+14 |
| * | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 4 | -17/+9 |
| * | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 | 1 | -2/+16 |
| * | Declare lookup_replace_object() in cache.h, not in commit.h | Junio C Hamano | 2011-05-15 | 2 | -2/+1 |
* | | Merge branch 'nd/sparse-co-fix' | Junio C Hamano | 2011-05-19 | 2 | -33/+83 |
|\ \ | |||||
| * | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 | 2 | -29/+75 |
| * | | t1011: fix sparse-checkout initialization and add new file | Nguyễn Thái Ngọc Duy | 2011-05-10 | 1 | -4/+8 |
| |/ | |||||
* | | Merge branch 'ld/p4-preserve-user-names' | Junio C Hamano | 2011-05-19 | 3 | -38/+340 |
|\ \ | |||||
| * | | git-p4: warn if git authorship won't be retained | Luke Diamand | 2011-05-13 | 3 | -2/+79 |
| * | | git-p4: small improvements to user-preservation | Luke Diamand | 2011-05-09 | 1 | -5/+14 |
| * | | git-p4: add option to preserve user names | Luke Diamand | 2011-04-26 | 3 | -38/+254 |
* | | | Merge branch 'ms/tagname-does-not-begin-with-dash' | Junio C Hamano | 2011-05-19 | 1 | -8/+18 |
|\ \ \ | |||||
| * | | | tag: disallow '-' as tag name | Michael Schubert | 2011-05-10 | 1 | -8/+18 |
| |/ / | |||||
* | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 | 4 | -14/+67 |
|\ \ \ | |||||
| * | | | test core.gitproxy configuration | Jeff King | 2011-05-18 | 1 | -0/+43 |
| * | | | send-pack: avoid deadlock on git:// push with failed pack-objects | Jeff King | 2011-05-16 | 1 | -0/+2 |
| * | | | connect: let callers know if connection is a socket | Jeff King | 2011-05-16 | 2 | -1/+7 |
| * | | | connect: treat generic proxy processes like ssh processes | Jeff King | 2011-05-16 | 1 | -13/+15 |
* | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-05-16 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | sideband_demux(): fix decl-after-stmt | Junio C Hamano | 2011-05-16 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 | 3 | -7/+36 |
|\ \ \ \ \ | |||||
| * | | | | | t3503: test cherry picking and reverting root commits | Jeff King | 2011-05-16 | 1 | -2/+25 |
| * | | | | | revert: allow reverting a root commit | Jeff King | 2011-05-16 | 1 | -3/+1 |
| * | | | | | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 | 1 | -2/+10 |
* | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 | 2 | -52/+45 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | setup_revisions(): take pathspec from command line and --stdin correctly | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
* | | | | | | | | | Merge 1.7.5.2 in | Junio C Hamano | 2011-05-19 | 2 | -1/+513 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Git 1.7.5.2v1.7.5.2 | Junio C Hamano | 2011-05-19 | 2 | -2/+3 |
| * | | | | | | | | | provide a copy of the LGPLv2.1 | Jonathan Nieder | 2011-05-19 | 1 | -0/+511 |
* | | | | | | | | | | Revert "Merge branch 'en/merge-recursive'" | Junio C Hamano | 2011-05-19 | 2 | -81/+6 |
* | | | | | | | | | | Makefile: sort TEST_PROGRAMS list | Jeff King | 2011-05-19 | 1 | -2/+2 |
* | | | | | | | | | | Update release notes to 1.7.6 | Junio C Hamano | 2011-05-16 | 1 | -13/+20 |
* | | | | | | | | | | Merge branch 'jc/convert' | Junio C Hamano | 2011-05-16 | 4 | -90/+84 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | convert: make it harder to screw up adding a conversion attribute | Junio C Hamano | 2011-05-09 | 1 | -41/+38 |
| * | | | | | | | | | | convert: make it safer to add conversion attributes | Junio C Hamano | 2011-05-09 | 1 | -26/+22 |
| * | | | | | | | | | | convert: give saner names to crlf/eol variables, types and functions | Junio C Hamano | 2011-05-09 | 1 | -30/+31 |
| * | | | | | | | | | | convert: rename the "eol" global variable to "core_eol" | Junio C Hamano | 2011-05-09 | 4 | -10/+10 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 | 6 | -31/+75 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Test atomic git-commit --interactive | Conrad Irwin | 2011-05-10 | 1 | -0/+10 |
| * | | | | | | | | | | Add commit to list of config.singlekey commands | Conrad Irwin | 2011-05-09 | 1 | -3/+4 |
| * | | | | | | | | | | Add support for -p/--patch to git-commit | Conrad Irwin | 2011-05-09 | 4 | -16/+27 |
| * | | | | | | | | | | Allow git commit --interactive with paths | Conrad Irwin | 2011-05-09 | 2 | -4/+3 |
| * | | | | | | | | | | t7501.8: feed a meaningful command | Jeff King | 2011-05-09 | 1 | -4/+6 |
| * | | | | | | | | | | Use a temporary index for git commit --interactive | Conrad Irwin | 2011-05-08 | 2 | -9/+30 |
* | | | | | | | | | | | Merge branch 'sg/completion-updates' | Junio C Hamano | 2011-05-16 | 1 | -4/+16 |
|\ \ \ \ \ \ \ \ \ \ \ |