Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 | 2 | -14/+4 | |
| * | | | | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 | 2 | -0/+38 | |
| * | | | | | | | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 | 2 | -24/+34 | |
| * | | | | | | | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 | 2 | -6/+156 | |
| * | | | | | | | | | | | | revert: give --continue handling its own function | Jonathan Nieder | 2011-12-12 | 1 | -11/+17 | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-snprintf-va-copy' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | compat/snprintf: don't look at va_list twicejk/maint-snprintf-va-copy | Jeff King | 2011-12-12 | 1 | -2/+7 | |
* | | | | | | | | | | | | | | Merge branch 'jk/maint-push-over-dav' into maint | Junio C Hamano | 2011-12-28 | 7 | -5/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-dav | Jeff King | 2011-12-13 | 6 | -6/+13 | |
| * | | | | | | | | | | | | | | t5540: test DAV push with authentication | Jeff King | 2011-12-13 | 2 | -0/+37 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 | 2 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | mv: be quiet about overwritingjk/maint-mv | Jeff King | 2011-12-12 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | mv: improve overwrite warning | Jeff King | 2011-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | mv: make non-directory destination error more clear | Jeff King | 2011-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | mv: honor --verbose flag | Jeff King | 2011-12-12 | 2 | -2/+7 | |
| * | | | | | | | | | | | | | | docs: mention "-k" for both forms of "git mv" | Jeff King | 2011-12-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 | 8 | -41/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | connect.c: drop path_match functionjk/fetch-no-tail-match-refs | Jeff King | 2011-12-13 | 2 | -22/+0 | |
| * | | | | | | | | | | | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | 2 | -4/+38 | |
| * | | | | | | | | | | | | | | | t5500: give fully-qualified refs to fetch-pack | Jeff King | 2011-12-13 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | drop "match" parameter from get_remote_heads | Jeff King | 2011-12-13 | 6 | -12/+7 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ew/keepalive' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | enable SO_KEEPALIVE for connected TCP sockets | Eric Wong | 2011-12-05 | 1 | -0/+13 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 | 2 | -7/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update documentation for stripspaceci/stripspace-docs | Conrad Irwin | 2011-12-12 | 2 | -7/+64 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jh/fast-import-notes' into maint | Junio C Hamano | 2011-12-28 | 2 | -8/+83 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notes | Johan Herland | 2011-11-28 | 2 | -7/+29 | |
| * | | | | | | | | | | | | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling | Johan Herland | 2011-11-28 | 1 | -0/+54 | |
| * | | | | | | | | | | | | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handling | Johan Herland | 2011-11-28 | 1 | -7/+6 | |
* | | | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint | Junio C Hamano | 2011-12-28 | 1 | -13/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amend | Andrew Wong | 2011-11-30 | 1 | -13/+23 | |
* | | | | | | | | | | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unused | Junio C Hamano | 2011-11-23 | 2374 | -58531/+446169 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | imap-send: Remove unused 'use_namespace' variable | Thomas Jarosch | 2011-11-23 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 6 | -13/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 5 | -12/+23 | |
| * | | | | | | | | | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 | 2 | -1/+24 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' into maint | Junio C Hamano | 2011-12-28 | 4 | -13/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimax | Nick Alcock | 2011-11-05 | 1 | -10/+31 | |
| * | | | | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAX | Johannes Sixt | 2011-11-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | Add strtoimax() compatibility function. | Nick Alcock | 2011-11-02 | 2 | -3/+13 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' into maint | Junio C Hamano | 2011-12-28 | 1 | -10/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-output | Jeff King | 2011-11-18 | 1 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | | | refresh_index: rename format variables | Jeff King | 2011-11-18 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flags | Jeff King | 2011-11-18 | 1 | -3/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Git 1.7.8.1v1.7.8.1 | Junio C Hamano | 2011-12-21 | 1 | -4/+25 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maint | Junio C Hamano | 2011-12-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-report | Jens Lehmann | 2011-12-08 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/userdiff-c-returns-pointer' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointer | Thomas Rast | 2011-12-06 | 1 | -1/+1 |