Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/cache-tree-api-refactor' | Junio C Hamano | 2012-02-12 | 5 | -20/+19 |
|\ | |||||
| * | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactor | Nguyễn Thái Ngọc Duy | 2012-02-07 | 5 | -20/+19 |
* | | Merge branch 'fc/zsh-completion' | Junio C Hamano | 2012-02-12 | 1 | -56/+11 |
|\ \ | |||||
| * | | completion: simplify __gitcomp and __gitcomp_nl implementationsfc/zsh-completion | Felipe Contreras | 2012-02-06 | 1 | -16/+3 |
| * | | completion: use ls -1 instead of rolling a loop to do that ourselves | Felipe Contreras | 2012-02-06 | 1 | -37/+2 |
| * | | completion: work around zsh option propagation bug | Felipe Contreras | 2012-02-06 | 1 | -3/+6 |
| |/ | |||||
* | | Merge branch 'mp/make-cleanse-x-for-exe' | Junio C Hamano | 2012-02-12 | 1 | -0/+3 |
|\ \ | |||||
| * | | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exe | Michael Palimaka | 2012-02-09 | 1 | -0/+3 |
* | | | Merge branch 'bw/inet-pton-ntop-compat' | Junio C Hamano | 2012-02-12 | 2 | -12/+0 |
|\ \ \ | |||||
| * | | | Drop system includes from inet_pton/inet_ntop compatibility wrappersbw/inet-pton-ntop-compat | Ben Walton | 2012-02-05 | 2 | -12/+0 |
* | | | | Merge branch 'jc/maint-commit-ignore-i-t-a' | Junio C Hamano | 2012-02-12 | 2 | -6/+8 |
|\ \ \ \ | |||||
| * | | | | commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-a | Junio C Hamano | 2012-02-07 | 2 | -6/+8 |
* | | | | | Merge branch 'jk/maint-tag-show-fixes' | Junio C Hamano | 2012-02-12 | 2 | -32/+53 |
|\ \ \ \ \ | |||||
| * | | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixes | Junio C Hamano | 2012-02-08 | 2 | -10/+25 |
| * | | | | | tag: die when listing missing or corrupt objects | Jeff King | 2012-02-06 | 1 | -1/+5 |
| * | | | | | tag: fix output of "tag -n" when errors occur | Jeff King | 2012-02-06 | 1 | -32/+34 |
| |/ / / / | |||||
* | | | | | Merge branch 'mm/empty-loose-error-message' | Junio C Hamano | 2012-02-12 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | fsck: give accurate error message on empty loose object filesmm/empty-loose-error-message | Matthieu Moy | 2012-02-06 | 1 | -0/+5 |
* | | | | | | Merge branch 'nk/ctype-for-perf' | Junio C Hamano | 2012-02-12 | 2 | -1/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ctype: implement islower/isupper macronk/ctype-for-perf | Namhyung Kim | 2012-02-10 | 1 | -0/+15 |
| * | | | | | | ctype.c only wants git-compat-util.h | Namhyung Kim | 2012-02-10 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jn/merge-no-edit-fix' | Junio C Hamano | 2012-02-12 | 2 | -1/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fix | Junio C Hamano | 2012-02-09 | 2 | -3/+19 |
* | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-10 | 1 | -1/+22 |
* | | | | | | | Merge branch 'js/add-e-submodule-fix' | Junio C Hamano | 2012-02-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fix | Johannes Schindelin | 2012-02-07 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/parse-date-raw' | Junio C Hamano | 2012-02-10 | 4 | -1/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-raw | Junio C Hamano | 2012-02-03 | 4 | -2/+32 |
| * | | | | | | | parse_date(): allow ancient git-timestamp | Junio C Hamano | 2012-02-03 | 1 | -0/+29 |
* | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 2012-02-10 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge | Junio C Hamano | 2012-02-05 | 2 | -1/+15 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' | Junio C Hamano | 2012-02-10 | 2 | -4/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidance | Junio C Hamano | 2012-02-05 | 2 | -4/+52 |
* | | | | | | | | Merge branch 'jn/rpm-spec' | Junio C Hamano | 2012-02-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git.spec: Workaround localized messages not put in any RPMjn/rpm-spec | Jakub Narebski | 2012-02-03 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/tests-write-script' | Junio C Hamano | 2012-02-10 | 2 | -6/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0300: use write_script helperjk/tests-write-script | Jeff King | 2012-02-03 | 1 | -6/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | tests: add write_script helper function | Junio C Hamano | 2012-02-03 | 1 | -0/+9 |
| |/ / / / / / | |||||
* | | | | | | | Sync with maint | Junio C Hamano | 2012-02-10 | 2 | -36/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update draft release notes to 1.7.9.1 | Junio C Hamano | 2012-02-10 | 1 | -0/+17 |
| * | | | | | | | Merge branch 'jc/maint-request-pull-for-tag' into maint | Junio C Hamano | 2012-02-10 | 3 | -8/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tr/grep-l-with-decoration' into maint | Junio C Hamano | 2012-02-10 | 2 | -2/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jl/submodule-re-add' into maint | Junio C Hamano | 2012-02-10 | 2 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'da/maint-mergetool-twoway' into maint | Junio C Hamano | 2012-02-10 | 2 | -5/+35 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-07 | 1 | -1/+12 |
* | | | | | | | | | | | | Merge branch 'jc/maint-request-pull-for-tag' | Junio C Hamano | 2012-02-07 | 3 | -8/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tag | Junio C Hamano | 2012-01-31 | 3 | -8/+4 |
* | | | | | | | | | | | | Merge branch 'bl/gitweb-project-filter' | Junio C Hamano | 2012-02-07 | 2 | -20/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | gitweb: Make project search respect project_filter | Jakub Narebski | 2012-02-01 | 1 | -5/+13 |
| * | | | | | | | | | | | | gitweb: improve usability of projects search form | Jakub Narebski | 2012-02-01 | 2 | -6/+28 |