Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/maint-apply-check-no-patch' | Junio C Hamano | 2011-12-13 | 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 'jn/branch-move-to-self' | Junio C Hamano | 2011-12-13 | 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 'jk/maint-upload-archive' | Junio C Hamano | 2011-12-13 | 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 |
* | | | | Merge branch 'jn/gitweb-side-by-side-diff' | Junio C Hamano | 2011-12-13 | 1 | -1/+72 |
|\ \ \ \ | |||||
| * | | | | t9500: Add basic sanity tests for side-by-side diff in gitweb | Jakub Narebski | 2011-10-31 | 1 | -1/+25 |
| * | | | | t9500: Add test for handling incomplete lines in diff by gitweb | Jakub Narebski | 2011-10-31 | 1 | -0/+47 |
* | | | | | git-p4: test for absolute PWD problem | Pete Wyckoff | 2011-12-11 | 1 | -0/+49 |
* | | | | | git-p4: submit test for auto-creating clientPath | Pete Wyckoff | 2011-12-11 | 1 | -0/+38 |
* | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-09 | 63 | -186/+189 |
|\ \ \ \ \ | |||||
| * | | | | | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 | 1 | -1/+5 |
| * | | | | | refs DWIMmery: use the same rule for both "git fetch" and others | Junio C Hamano | 2011-11-07 | 1 | -3/+2 |
| * | | | | | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 4 | -8/+8 |
| * | | | | | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-04 | 58 | -174/+174 |
* | | | | | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-09 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | request-pull: use the annotated tag contents | Junio C Hamano | 2011-11-09 | 1 | -0/+4 |
| * | | | | | | request-pull: state what commit to expect | Junio C Hamano | 2011-10-05 | 1 | -0/+6 |
| * | | | | | | Merge branch 'bk/ancestry-path' into jc/branch-desc | Junio C Hamano | 2011-09-21 | 1 | -0/+38 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 | 1 | -2/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-config | Ævar Arnfjörð Bjarmason | 2011-11-07 | 1 | -2/+21 |
* | | | | | | | | | Merge branch 'gh/userdiff-matlab' | Junio C Hamano | 2011-12-05 | 5 | -1/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add built-in diff patterns for MATLAB codegh/userdiff-matlab | Gustaf Hendeby | 2011-11-15 | 5 | -1/+34 |
* | | | | | | | | | | git-p4: introduce skipSubmitEdit | Pete Wyckoff | 2011-12-05 | 1 | -0/+82 |
* | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |