Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-push-over-dav' into maint | Junio C Hamano | 2011-12-28 | 2 | -0/+37 |
|\ | |||||
| * | http-push: enable "proactive auth"jk/maint-push-over-dav | Jeff King | 2011-12-13 | 1 | -1/+1 |
| * | t5540: test DAV push with authentication | Jeff King | 2011-12-13 | 2 | -0/+37 |
* | | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 | 2 | -3/+32 |
|\ \ | |||||
| * | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | 1 | -0/+29 |
| * | | t5500: give fully-qualified refs to fetch-pack | Jeff King | 2011-12-13 | 1 | -3/+3 |
| |/ | |||||
* | | Merge branch 'jh/fast-import-notes' into maint | Junio C Hamano | 2011-12-28 | 1 | -5/+58 |
|\ \ | |||||
| * | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notes | Johan Herland | 2011-11-28 | 1 | -4/+4 |
| * | | 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 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 2 | -4/+21 |
|\ \ | |||||
| * | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 1 | -4/+5 |
| * | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 | 1 | -0/+16 |
* | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 2 | -1/+20 |
|\ \ \ | |||||
| * | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patch | Brandon Casey | 2011-12-05 | 1 | -0/+19 |
| * | | | t/t4131-apply-fake-ancestor.sh: fix broken test | Brandon Casey | 2011-12-05 | 1 | -1/+1 |
* | | | | Merge branch 'jk/maint-upload-archive' into maint | Junio C Hamano | 2011-12-21 | 1 | -0/+8 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive | Junio C Hamano | 2011-11-21 | 1 | -0/+8 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archive | Jeff King | 2011-11-21 | 1 | -0/+8 |
* | | | | revert --abort: do not leave behind useless sequencer-old directory | Jonathan Nieder | 2011-11-23 | 1 | -0/+8 |
| |_|/ |/| | | |||||
* | | | revert: remove --reset compatibility optionjn/revert-quit | Jonathan Nieder | 2011-11-22 | 1 | -2/+2 |
* | | | revert: introduce --abort to cancel a failed cherry-pick | Jonathan Nieder | 2011-11-22 | 1 | -0/+96 |
* | | | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 | 1 | -0/+54 |
* | | | revert: rename --reset option to --quit | Jonathan Nieder | 2011-11-22 | 2 | -6/+27 |
* | | | t5501-*.sh: Fix url passed to clone in setup test | Ramsay Jones | 2011-11-20 | 1 | -1/+1 |
* | | | refs: loosen over-strict "format" check | Junio C Hamano | 2011-11-16 | 1 | -0/+7 |
* | | | Revert "upload-archive: use start_command instead of fork" | Junio C Hamano | 2011-11-15 | 1 | -5/+5 |
* | | | Merge branch 'ab/i18n-test-fix' | Junio C Hamano | 2011-11-06 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | t/t7508-status.sh: use test_i18ncmpab/i18n-test-fix | Ævar Arnfjörð Bjarmason | 2011-11-05 | 1 | -2/+2 |
| * | | | t/t6030-bisect-porcelain.sh: use test_i18ngrep | Ævar Arnfjörð Bjarmason | 2011-11-05 | 1 | -1/+1 |
* | | | | Merge branch 'pw/p4-appledouble-fix' | Junio C Hamano | 2011-11-06 | 1 | -0/+31 |
|\ \ \ \ | |||||
| * | | | | git-p4: ignore apple filetype | Pete Wyckoff | 2011-11-05 | 1 | -0/+31 |
* | | | | | t3200: add test case for 'branch -m' | Stefan Naewe | 2011-11-02 | 1 | -0/+5 |
* | | | | | Sync with 1.7.7.2 | Junio C Hamano | 2011-11-01 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-11-01 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | t7511: avoid use of reserved filename on Windows. | Pat Thoyts | 2011-10-31 | 1 | -1/+1 |
| * | | | | | Merge branch 'bc/attr-ignore-case' into maint | Junio C Hamano | 2011-11-01 | 1 | -1/+58 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'cn/fetch-prune' into maint | Junio C Hamano | 2011-11-01 | 1 | -0/+50 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-01 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | (squash) test for previous | Junio C Hamano | 2011-10-28 | 1 | -0/+11 |
* | | | | | | | | | Merge branch 'ef/mingw-upload-archive' | Junio C Hamano | 2011-11-01 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | upload-archive: use start_command instead of fork | Erik Faye-Lund | 2011-10-30 | 1 | -5/+5 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-27 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-10-27 | 1 | -0/+50 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | read-cache.c: fix index memory allocation | René Scharfe | 2011-10-26 | 1 | -0/+50 |
| * | | | | | | | | | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 4 | -18/+85 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -18/+40 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'mz/remote-rename' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+31 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |