Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-09 |
|\ | |||
| * | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 |
| * | refs DWIMmery: use the same rule for both "git fetch" and others | Junio C Hamano | 2011-11-07 |
| * | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 |
| * | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-04 |
* | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-09 |
|\ \ | |||
| * | | request-pull: use the annotated tag contents | Junio C Hamano | 2011-11-09 |
| * | | request-pull: state what commit to expect | Junio C Hamano | 2011-10-05 |
| * | | Merge branch 'bk/ancestry-path' into jc/branch-desc | Junio C Hamano | 2011-09-21 |
| |\ \ | |||
* | \ \ | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 |
|\ \ \ \ | |||
| * | | | | pull: introduce a pull.rebase option to enable --rebase | Ævar Arnfjörð Bjarmason | 2011-11-07 |
* | | | | | Merge branch 'gh/userdiff-matlab' | Junio C Hamano | 2011-12-05 |
|\ \ \ \ \ | |||
| * | | | | | Add built-in diff patterns for MATLAB code | Gustaf Hendeby | 2011-11-15 |
* | | | | | | git-p4: introduce skipSubmitEdit | Pete Wyckoff | 2011-12-05 |
* | | | | | | revert --abort: do not leave behind useless sequencer-old directory | Jonathan Nieder | 2011-11-23 |
* | | | | | | revert: remove --reset compatibility option | Jonathan Nieder | 2011-11-22 |
* | | | | | | revert: introduce --abort to cancel a failed cherry-pick | Jonathan Nieder | 2011-11-22 |
* | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 |
* | | | | | | revert: rename --reset option to --quit | Jonathan Nieder | 2011-11-22 |
* | | | | | | t5501-*.sh: Fix url passed to clone in setup test | Ramsay Jones | 2011-11-20 |
* | | | | | | refs: loosen over-strict "format" check | Junio C Hamano | 2011-11-16 |
* | | | | | | Revert "upload-archive: use start_command instead of fork" | Junio C Hamano | 2011-11-15 |
|/ / / / / | |||
* | | | | | Merge branch 'ab/i18n-test-fix' | Junio C Hamano | 2011-11-06 |
|\ \ \ \ \ | |||
| * | | | | | t/t7508-status.sh: use test_i18ncmp | Ævar Arnfjörð Bjarmason | 2011-11-05 |
| * | | | | | t/t6030-bisect-porcelain.sh: use test_i18ngrep | Ævar Arnfjörð Bjarmason | 2011-11-05 |
* | | | | | | Merge branch 'pw/p4-appledouble-fix' | Junio C Hamano | 2011-11-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-p4: ignore apple filetype | Pete Wyckoff | 2011-11-05 |
* | | | | | | | t3200: add test case for 'branch -m' | Stefan Naewe | 2011-11-02 |
* | | | | | | | Sync with 1.7.7.2 | Junio C Hamano | 2011-11-01 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-11-01 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | t7511: avoid use of reserved filename on Windows. | Pat Thoyts | 2011-10-31 |
| * | | | | | | | | Merge branch 'bc/attr-ignore-case' into maint | Junio C Hamano | 2011-11-01 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'cn/fetch-prune' into maint | Junio C Hamano | 2011-11-01 |
| |\ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | (squash) test for previous | Junio C Hamano | 2011-10-28 |
* | | | | | | | | | | | | Merge branch 'ef/mingw-upload-archive' | Junio C Hamano | 2011-11-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | upload-archive: use start_command instead of fork | Erik Faye-Lund | 2011-10-30 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maint | Junio C Hamano | 2011-10-27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | read-cache.c: fix index memory allocation | René Scharfe | 2011-10-26 |
| * | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 | Junio C Hamano | 2011-10-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mz/remote-rename' into maint-1.7.6 | Junio C Hamano | 2011-10-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 | Junio C Hamano | 2011-10-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 | Junio C Hamano | 2011-10-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6 | Junio C Hamano | 2011-10-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-clone-alternates' into maint | Junio C Hamano | 2011-09-23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-clone-gitdir' into maint | Junio C Hamano | 2011-09-23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |