Commit message (Expand) | Author | Age | |
---|---|---|---|
* | t9500: Add basic sanity tests for side-by-side diff in gitweb | Jakub Narebski | 2011-10-31 |
* | t9500: Add test for handling incomplete lines in diff by gitweb | Jakub Narebski | 2011-10-31 |
* | 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 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'mh/check-ref-format-print-normalize' into maint | Junio C Hamano | 2011-09-23 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'mg/branch-set-upstream-previous' into maint | Junio C Hamano | 2011-09-23 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reset-reflog-message-fix' into maint | Junio C Hamano | 2011-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vi/make-test-vector-less-specific' into maint | Junio C Hamano | 2011-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-config-param' into maint | Junio C Hamano | 2011-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-1.7.2-status-ignored' into maint | Junio C Hamano | 2011-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint | Junio C Hamano | 2011-10-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-config-explicit-bool-display' into maint | Junio C Hamano | 2011-10-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lh/gitweb-site-html-head' | Junio C Hamano | 2011-10-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | gitweb: provide a way to customize html headers | Lénaïc Huard | 2011-10-21 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/libperl-git-config' | Junio C Hamano | 2011-10-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | Add simple test for Git::config_path() in t/t9700-perl-git.sh | Jakub Narebski | 2011-10-21 |
| |/ / / / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune' | Junio C Hamano | 2011-10-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning | Carlos Martín Nieto | 2011-10-15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refs | Carlos Martín Nieto | 2011-10-15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5510: add tests for fetch --prune | Carlos Martín Nieto | 2011-10-07 |
| |/ / / / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-update' | Junio C Hamano | 2011-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle files with shell metacharacters | Luke Diamand | 2011-10-17 |
| * | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle utf16 filetype properly | Pete Wyckoff | 2011-10-17 |
| * | | | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: refactor and cleanup | Pete Wyckoff | 2011-10-17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip' | Junio C Hamano | 2011-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notation | Junio C Hamano | 2011-10-14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at prompt | Sitaram Chamarty | 2011-10-10 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile' | Junio C Hamano | 2011-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfiles | Phil Hord | 2011-10-04 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bits | Jeff King | 2011-10-20 |
* | | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script | Brandon Casey | 2011-10-19 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as context | René Scharfe | 2011-10-10 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / |