Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 10 | -31/+276 |
|\ | |||||
| * | setup.c: Fix some "symbol not declared" sparse warnings | Ramsay Jones | 2011-05-17 | 1 | -2/+2 |
| * | t3703: Skip tests using directory name ":" on Windows | Johannes Sixt | 2011-05-12 | 1 | -2/+6 |
| * | revision.c: leave a note for "a lone :" enhancement | Junio C Hamano | 2011-05-11 | 1 | -0/+14 |
| * | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| |\ | |||||
| * | | t3703, t4208: add test cases for magic pathspec | Nguyễn Thái Ngọc Duy | 2011-05-10 | 3 | -0/+93 |
| * | | rev/path disambiguation: further restrict "misspelled index entry" diag | Junio C Hamano | 2011-05-10 | 1 | -2/+11 |
| * | | fix overslow :/no-such-string-ever-existed diagnostics | Junio C Hamano | 2011-05-10 | 3 | -13/+14 |
| * | | fix overstrict :<path> diagnosis | Junio C Hamano | 2011-05-10 | 1 | -1/+1 |
| * | | grep: use get_pathspec() correctly | Junio C Hamano | 2011-05-10 | 1 | -7/+1 |
| * | | pathspec: drop "lone : means no pathspec" from get_pathspec() | Junio C Hamano | 2011-05-10 | 1 | -3/+0 |
| * | | Revert "magic pathspec: add ":(icase)path" to match case insensitively" | Junio C Hamano | 2011-05-10 | 2 | -32/+6 |
| * | | magic pathspec: add ":(icase)path" to match case insensitively | Junio C Hamano | 2011-04-08 | 2 | -6/+32 |
| * | | magic pathspec: futureproof shorthand form | Junio C Hamano | 2011-04-08 | 3 | -8/+18 |
| * | | magic pathspec: add tentative ":/path/from/top/level" pathspec support | Junio C Hamano | 2011-04-06 | 2 | -3/+126 |
* | | | Merge branch 'jk/blame-line-porcelain' | Junio C Hamano | 2011-05-23 | 4 | -10/+131 |
|\ \ \ | |||||
| * | | | blame: add --line-porcelain output format | Jeff King | 2011-05-09 | 4 | -2/+45 |
| * | | | blame: refactor porcelain output | Jeff King | 2011-05-09 | 1 | -9/+16 |
| * | | | add tests for various blame formats | Jeff King | 2011-05-09 | 1 | -0/+71 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-20 | 2 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 | 2 | -1/+16 |
* | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-19 | 1 | -1/+22 |
* | | | | | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+44 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'rg/copy-gecos-username' | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | copy_gecos: fix not adding nlen to len when processing "&" | Rafael Gieschke | 2011-05-17 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jl/submodule-conflicted-gitmodules' | Junio C Hamano | 2011-05-19 | 2 | -6/+117 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 | 2 | -5/+32 |
| * | | | | | | | test that git status works with merge conflict in, .gitmodules | Heiko Voigt | 2011-05-14 | 1 | -4/+88 |
* | | | | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 8 | -23/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanism | Junio C Hamano | 2011-05-15 | 2 | -5/+12 |
| * | | | | | | | | inline lookup_replace_object() calls | Junio C Hamano | 2011-05-15 | 3 | -4/+14 |
| * | | | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 4 | -17/+9 |
| * | | | | | | | | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 | 1 | -2/+16 |
| * | | | | | | | | Declare lookup_replace_object() in cache.h, not in commit.h | Junio C Hamano | 2011-05-15 | 2 | -2/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/sparse-co-fix' | Junio C Hamano | 2011-05-19 | 2 | -33/+83 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 | 2 | -29/+75 |
| * | | | | | | | | t1011: fix sparse-checkout initialization and add new file | Nguyễn Thái Ngọc Duy | 2011-05-10 | 1 | -4/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ld/p4-preserve-user-names' | Junio C Hamano | 2011-05-19 | 3 | -38/+340 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: warn if git authorship won't be retained | Luke Diamand | 2011-05-13 | 3 | -2/+79 |
| * | | | | | | | | git-p4: small improvements to user-preservation | Luke Diamand | 2011-05-09 | 1 | -5/+14 |
| * | | | | | | | | git-p4: add option to preserve user names | Luke Diamand | 2011-04-26 | 3 | -38/+254 |
* | | | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash' | Junio C Hamano | 2011-05-19 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tag: disallow '-' as tag name | Michael Schubert | 2011-05-10 | 1 | -8/+18 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 | 4 | -14/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test core.gitproxy configuration | Jeff King | 2011-05-18 | 1 | -0/+43 |
| * | | | | | | | | | send-pack: avoid deadlock on git:// push with failed pack-objects | Jeff King | 2011-05-16 | 1 | -0/+2 |
| * | | | | | | | | | connect: let callers know if connection is a socket | Jeff King | 2011-05-16 | 2 | -1/+7 |
| * | | | | | | | | | connect: treat generic proxy processes like ssh processes | Jeff King | 2011-05-16 | 1 | -13/+15 |
* | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ |