Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/remove-remote-helpers-in-python' | Junio C Hamano | 2013-09-17 | 2 | -178/+0 |
|\ | |||||
| * | git_remote_helpers: remove little used Python libraryjk/remove-remote-helpers-in-python | John Keeping | 2013-09-09 | 2 | -178/+0 |
* | | Merge branch 'rh/ishes-doc' | Junio C Hamano | 2013-09-17 | 1 | -3/+3 |
|\ \ | |||||
| * | | use 'commit-ish' instead of 'committish' | Richard Hansen | 2013-09-04 | 1 | -3/+3 |
* | | | Merge branch 'jk/write-broken-index-with-nul-sha1' | Junio C Hamano | 2013-09-17 | 1 | -0/+49 |
|\ \ \ | |||||
| * | | | write_index: optionally allow broken null sha1sjk/write-broken-index-with-nul-sha1 | Jeff King | 2013-08-28 | 1 | -0/+49 |
* | | | | Merge branch 'tb/precompose-autodetect-fix' | Junio C Hamano | 2013-09-17 | 3 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Set core.precomposeunicode to true on e.g. HFS+tb/precompose-autodetect-fix | Torsten Bögershausen | 2013-08-27 | 3 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'kk/tests-with-no-perl' | Junio C Hamano | 2013-09-17 | 3 | -44/+67 |
|\ \ \ \ | |||||
| * | | | | reset test: modernize stylekk/tests-with-no-perl | Jonathan Nieder | 2013-08-24 | 1 | -7/+24 |
| * | | | | t/t7106-reset-unborn-branch.sh: Add PERL prerequisite | Kacper Kornet | 2013-08-24 | 1 | -1/+1 |
| * | | | | add -i test: use skip_all instead of repeated PERL prerequisite | Jonathan Nieder | 2013-08-24 | 1 | -35/+41 |
| * | | | | Make test "using invalid commit with -C" more strict | Kacper Kornet | 2013-08-24 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'ap/commit-author-mailmap' | Junio C Hamano | 2013-09-17 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | commit: search author pattern against mailmapap/commit-author-mailmap | Antoine Pelisse | 2013-08-24 | 1 | -0/+11 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2013-09-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t7406-submodule-update: add missing && | Tay Ray Chuan | 2013-09-17 | 1 | -1/+1 |
| * | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maint | Junio C Hamano | 2013-09-05 | 1 | -0/+16 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'mm/mediawiki-dumb-push-fix' | Junio C Hamano | 2013-09-12 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | transport-helper: add no-private-update capability | Matthieu Moy | 2013-09-03 | 1 | -0/+11 |
* | | | | | | Merge branch 'jc/commit-is-spelled-with-two-ems' | Junio C Hamano | 2013-09-12 | 4 | -10/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | typofix: cherry is spelled with two arsjc/commit-is-spelled-with-two-ems | Junio C Hamano | 2013-09-05 | 2 | -2/+2 |
| * | | | | | | typofix: commit is spelled with two ems | Junio C Hamano | 2013-09-04 | 2 | -8/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/config-int-range-check' | Junio C Hamano | 2013-09-12 | 2 | -4/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-config: always treat --int as 64-bit internally | Jeff King | 2013-09-09 | 1 | -0/+7 |
| * | | | | | | config: make numeric parsing errors more clear | Jeff King | 2013-09-09 | 2 | -4/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/ls-files-killed-optim' | Junio C Hamano | 2013-09-11 | 1 | -8/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optim | Eric Sunshine | 2013-08-23 | 1 | -6/+9 |
| * | | | | | | t3010: update to demonstrate "ls-files -k" optimization pitfalls | Junio C Hamano | 2013-08-15 | 1 | -3/+9 |
* | | | | | | | Merge branch 'es/rebase-i-no-abbrev' | Junio C Hamano | 2013-09-11 | 1 | -2/+87 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrev | Junio C Hamano | 2013-08-25 | 1 | -1/+1 |
| * | | | | | | | t3404: rebase -i: demonstrate short SHA-1 collision | Eric Sunshine | 2013-08-25 | 1 | -0/+24 |
| * | | | | | | | t3404: make tests more self-contained | Eric Sunshine | 2013-08-25 | 1 | -2/+63 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rt/rebase-p-no-merge-summary' | Junio C Hamano | 2013-09-11 | 1 | -0/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summary | Ralf Thielow | 2013-08-21 | 1 | -0/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh/pull-rebase-preserve' | Junio C Hamano | 2013-09-11 | 1 | -0/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserve | Stephen Haberman | 2013-09-04 | 1 | -0/+89 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/push-no-thin' | Junio C Hamano | 2013-09-11 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: respect --no-thinnd/push-no-thin | Nguyễn Thái Ngọc Duy | 2013-08-13 | 1 | -0/+17 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/mailmap-incomplete-line' | Junio C Hamano | 2013-09-09 | 1 | -1/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-line | Jeff King | 2013-08-28 | 1 | -1/+15 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sp/clip-read-write-to-8mb' | Junio C Hamano | 2013-09-09 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | xread, xwrite: limit size of IO to 8MB | Steffen Prohaska | 2013-08-20 | 1 | -0/+14 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' | Junio C Hamano | 2013-09-09 | 1 | -0/+72 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5802: add test for connect helper | Junio C Hamano | 2013-08-07 | 1 | -0/+72 |
* | | | | | | | | Merge branch 'jc/url-match' | Junio C Hamano | 2013-09-09 | 15 | -0/+223 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: "git config --get-urlmatch" parses section.<url>.key | Junio C Hamano | 2013-08-05 | 1 | -0/+25 |
| * | | | | | | | | config: parse http.<url>.<variable> using urlmatch | Kyle J. McKay | 2013-08-05 | 14 | -0/+198 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 7 | -23/+421 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rm: delete .gitmodules entry of submodules removed from the work tree | Jens Lehmann | 2013-08-06 | 3 | -19/+99 |