Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/ls-files-killed-optim' into maint | Junio C Hamano | 2013-10-23 | 1 | -8/+19 |
|\ | |||||
| * | dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage | Eric Sunshine | 2013-08-24 | 1 | -6/+9 |
| * | t3010: update to demonstrate "ls-files -k" optimization pitfalls | Junio C Hamano | 2013-08-15 | 1 | -3/+9 |
* | | Merge branch 'jh/checkout-auto-tracking' into maint | Junio C Hamano | 2013-10-23 | 2 | -4/+40 |
|\ \ | |||||
| * | | t3200: fix failure on case-insensitive filesystems | Eric Sunshine | 2013-09-17 | 1 | -0/+1 |
| * | | branch.c: Relax unnecessary requirement on upstream's remote ref name | Per Cederqvist | 2013-09-09 | 1 | -1/+1 |
| * | | t3200: Add test demonstrating minor regression in 41c21f2 | Johan Herland | 2013-09-09 | 1 | -0/+34 |
| * | | t3200: Minor fix when preparing for tracking failure | Johan Herland | 2013-09-09 | 1 | -1/+2 |
| * | | t2024: Fix &&-chaining and a couple of typos | Johan Herland | 2013-09-09 | 1 | -3/+3 |
* | | | Merge branch 'nd/fetch-into-shallow' into maint | Junio C Hamano | 2013-10-23 | 2 | -3/+11 |
|\ \ \ | |||||
| * | | | Add testcase for needless objects during a shallow fetch | Matthijs Kooijman | 2013-08-28 | 1 | -0/+11 |
| * | | | upload-pack: delegate rev walking in shallow fetch to pack-objects | Nguyễn Thái Ngọc Duy | 2013-08-28 | 1 | -3/+0 |
* | | | | Merge branch 'nd/git-dir-pointing-at-gitfile' into maint | Junio C Hamano | 2013-10-18 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specified | Nguyễn Thái Ngọc Duy | 2013-09-03 | 1 | -0/+4 |
* | | | | | Merge branch 'ap/commit-author-mailmap' into maint | Junio C Hamano | 2013-10-18 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | commit: search author pattern against mailmap | Antoine Pelisse | 2013-08-25 | 1 | -0/+11 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'es/rebase-i-no-abbrev' into maint | Junio C Hamano | 2013-10-18 | 1 | -2/+87 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: fix short SHA-1 collision | Junio C Hamano | 2013-08-26 | 1 | -1/+1 |
| * | | | | | t3404: rebase -i: demonstrate short SHA-1 collision | Eric Sunshine | 2013-08-26 | 1 | -0/+24 |
| * | | | | | t3404: make tests more self-contained | Eric Sunshine | 2013-08-26 | 1 | -2/+63 |
* | | | | | | Merge branch 'rt/rebase-p-no-merge-summary' into maint | Junio C Hamano | 2013-10-18 | 1 | -0/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase --preserve-merges: ignore "merge.log" config | Ralf Thielow | 2013-08-22 | 1 | -0/+23 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | t4254: modernize tests | SZEDER Gábor | 2013-10-18 | 1 | -21/+15 |
* | | | | | | clone --branch: refuse to clone if upstream repo is empty | Ralf Thielow | 2013-10-14 | 1 | -1/+7 |
* | | | | | | Merge branch 'bc/completion-for-bash-3.0' into maint | Junio C Hamano | 2013-09-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9902-completion.sh: old Bash still does not support array+=('') notation | Brandon Casey | 2013-08-22 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mm/no-shell-escape-in-die-message' into maint | Junio C Hamano | 2013-09-18 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | die_with_status: use "printf '%s\n'", not "echo" | Matthieu Moy | 2013-08-07 | 1 | -0/+13 |
* | | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean' into maint | Junio C Hamano | 2013-09-18 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | avoid segfault on submodule.*.path set to an empty "true" | Jharrod LaFon | 2013-08-19 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maint | Junio C Hamano | 2013-09-18 | 2 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log: use true parents for diff when walking reflogs | Thomas Rast | 2013-08-05 | 1 | -0/+22 |
| * | | | | | | | | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 | 1 | -0/+6 |
* | | | | | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maint | Junio C Hamano | 2013-09-18 | 1 | -0/+72 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5802: add test for connect helper | Junio C Hamano | 2013-08-08 | 1 | -0/+72 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sp/clip-read-write-to-8mb' into maint | Junio C Hamano | 2013-09-18 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | xread, xwrite: limit size of IO to 8MB | Steffen Prohaska | 2013-08-20 | 1 | -0/+14 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/mailmap-incomplete-line' into maint | Junio C Hamano | 2013-09-18 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mailmap: handle mailmap blobs without trailing newlines | Jeff King | 2013-08-28 | 1 | -1/+15 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specified | Nguyễn Thái Ngọc Duy | 2013-08-26 | 1 | -0/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Revert "Add new @ shortcut for HEAD" | Junio C Hamano | 2013-08-15 | 1 | -2/+0 |
* | | | | | | | | Revert "git stash: avoid data loss when "git stash save" kills a directory" | Junio C Hamano | 2013-08-14 | 1 | -18/+0 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-08-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | t/t7407: fix two typos in submodule tests | Phil Hord | 2013-08-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t8001, t8002: fix "blame -L :literal" test on NetBSD | René Scharfe | 2013-08-05 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'dn/test-reject-utf-16' | Junio C Hamano | 2013-08-05 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3900: test rejecting log message with NULs correctly | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |