Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mg/pushurl' | Junio C Hamano | 2009-06-20 | 2 | -3/+20 |
|\ | |||||
| * | builtin-remote: Show push urls as well | Michael J Gruber | 2009-06-13 | 1 | -3/+7 |
| * | t5516: Check pushurl config setting | Michael J Gruber | 2009-06-09 | 1 | -0/+13 |
* | | Merge branch 'sb/pull-rebase' | Junio C Hamano | 2009-06-20 | 1 | -0/+14 |
|\ \ | |||||
| * | | parse-remote: support default reflist in get_remote_merge_branch | Santi BĂ©jar | 2009-06-11 | 1 | -0/+14 |
| |/ | |||||
* | | Merge branch 'pb/send-email-cccmd-fix' | Junio C Hamano | 2009-06-20 | 1 | -5/+75 |
|\ \ | |||||
| * | | Test cccmd in t9001-send-email.sh and fix some bugs | Paolo Bonzini | 2009-06-18 | 1 | -5/+75 |
* | | | Merge branch 'sb/maint-1.6.0-add-config-fix' | Junio C Hamano | 2009-06-20 | 1 | -0/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | add: allow configurations to be overriden by command line | Stephen Boyd | 2009-06-18 | 1 | -0/+13 |
* | | | Merge branch 'mh/fix-send-email-threaded' | Junio C Hamano | 2009-06-13 | 1 | -0/+21 |
|\ \ \ | |||||
| * \ \ | Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded | Junio C Hamano | 2009-06-12 | 1 | -0/+10 |
| |\ \ \ | |||||
| | * | | | send-email: fix non-threaded mails | Markus Heidelberg | 2009-06-12 | 1 | -1/+1 |
| | * | | | add a test for git-send-email for non-threaded mails | Markus Heidelberg | 2009-06-12 | 1 | -0/+10 |
| * | | | | send-email: fix threaded mails without chain-reply-to | Markus Heidelberg | 2009-06-12 | 1 | -1/+1 |
| * | | | | add a test for git-send-email for threaded mails without chain-reply-to | Markus Heidelberg | 2009-06-12 | 1 | -0/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'rc/http-push' | Junio C Hamano | 2009-06-13 | 2 | -0/+44 |
|\ \ \ \ | |||||
| * | | | | t5550-http-fetch: test fetching of packed objects | Tay Ray Chuan | 2009-06-06 | 1 | -0/+8 |
| * | | | | http-push: send out fetch requests on queue | Tay Ray Chuan | 2009-06-06 | 1 | -2/+2 |
| * | | | | t5540-http-push: test fetching of packed objects | Tay Ray Chuan | 2009-06-06 | 1 | -0/+20 |
| * | | | | t5540-http-push: test fetching of loose objects | Tay Ray Chuan | 2009-06-06 | 1 | -0/+16 |
* | | | | | Merge branch 'cc/bisect' (early part) | Junio C Hamano | 2009-06-13 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | t6030: test skipping away from an already skipped commit | Christian Couder | 2009-06-06 | 1 | -0/+12 |
* | | | | | | Merge branch 'cb/maint-no-double-merge' | Junio C Hamano | 2009-06-13 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refuse to merge during a merge | Clemens Buchacher | 2009-06-01 | 1 | -0/+3 |
* | | | | | | | Merge branch 'ph/submodule-rebase' (early part) | Junio C Hamano | 2009-06-13 | 1 | -0/+140 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename submodule.<name>.rebase to submodule.<name>.update | Johan Herland | 2009-06-03 | 1 | -8/+8 |
| * | | | | | | | git-submodule: add support for --rebase. | Peter Hutterer | 2009-04-24 | 1 | -0/+140 |
* | | | | | | | | Merge branch 'nw/maint-cvsexportcommit' | Junio C Hamano | 2009-06-13 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | git-cvsexportcommit can't commit files which have been removed from CVS | Nick Woolley | 2009-05-28 | 1 | -0/+18 |
* | | | | | | | | send-email: use UTF-8 rather than utf-8 for consistency | Brandon Casey | 2009-06-09 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'da/pretty-tempname' | Junio C Hamano | 2009-06-03 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: generate pretty filenames in prep_temp_blob() | David Aguilar | 2009-05-31 | 1 | -0/+9 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-03 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | blame: correctly handle a path that used to be a directory | Junio C Hamano | 2009-06-03 | 1 | -0/+15 |
| * | | | | | | | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint | Junio C Hamano | 2009-06-02 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Change xdl_merge to generate output even for null merges | Charles Bailey | 2009-05-24 | 1 | -1/+1 |
| | * | | | | | | | | t6023: merge-file fails to output anything for a degenerate merge | Charles Bailey | 2009-05-24 | 1 | -0/+6 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'rs/maint-grep-word-regexp-fix' into maint | Junio C Hamano | 2009-06-02 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint | Junio C Hamano | 2009-06-02 | 3 | -0/+84 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-add-p-coalesce-fix' into maint | Junio C Hamano | 2009-06-02 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | test-lib: fix http exit codes | Clemens Buchacher | 2009-06-01 | 1 | -2/+4 |
* | | | | | | | | | | | test-lib: allow exit trap to be used for cleanup by tests | Clemens Buchacher | 2009-06-01 | 1 | -7/+14 |
* | | | | | | | | | | | test-lib: fail if invalid options are passed | Clemens Buchacher | 2009-06-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'sb/opt-filename' | Junio C Hamano | 2009-05-31 | 1 | -2/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | parse-opts: add OPT_FILENAME and transition builtins | Stephen Boyd | 2009-05-25 | 1 | -2/+17 |
| * | | | | | | | | | | | Merge branch 'jc/mktree' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 1 | -0/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 169 | -829/+3964 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | / / / / / | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jc/mktree' | Junio C Hamano | 2009-05-31 | 1 | -0/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | mktree --missing: allow missing objects | Junio C Hamano | 2009-05-10 | 1 | -0/+10 |
| * | | | | | | | | | | | t1010: add mktree test | Junio C Hamano | 2009-05-10 | 1 | -0/+61 |