summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-2310-31/+276
|\
| * setup.c: Fix some "symbol not declared" sparse warningsRamsay Jones2011-05-171-2/+2
| * t3703: Skip tests using directory name ":" on WindowsJohannes Sixt2011-05-121-2/+6
| * revision.c: leave a note for "a lone :" enhancementJunio C Hamano2011-05-111-0/+14
| * Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| |\
| * | t3703, t4208: add test cases for magic pathspecNguyễn Thái Ngọc Duy2011-05-103-0/+93
| * | rev/path disambiguation: further restrict "misspelled index entry" diagJunio C Hamano2011-05-101-2/+11
| * | fix overslow :/no-such-string-ever-existed diagnosticsJunio C Hamano2011-05-103-13/+14
| * | fix overstrict :<path> diagnosisJunio C Hamano2011-05-101-1/+1
| * | grep: use get_pathspec() correctlyJunio C Hamano2011-05-101-7/+1
| * | pathspec: drop "lone : means no pathspec" from get_pathspec()Junio C Hamano2011-05-101-3/+0
| * | Revert "magic pathspec: add ":(icase)path" to match case insensitively"Junio C Hamano2011-05-102-32/+6
| * | magic pathspec: add ":(icase)path" to match case insensitivelyJunio C Hamano2011-04-082-6/+32
| * | magic pathspec: futureproof shorthand formJunio C Hamano2011-04-083-8/+18
| * | magic pathspec: add tentative ":/path/from/top/level" pathspec supportJunio C Hamano2011-04-062-3/+126
* | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-234-10/+131
|\ \ \
| * | | blame: add --line-porcelain output formatJeff King2011-05-094-2/+45
| * | | blame: refactor porcelain outputJeff King2011-05-091-9/+16
| * | | add tests for various blame formatsJeff King2011-05-091-0/+71
* | | | Merge branch 'maint'Junio C Hamano2011-05-202-1/+16
|\ \ \ \
| * | | | git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-202-1/+16
* | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-191-1/+22
* | | | | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-190-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+44
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'rg/copy-gecos-username'Junio C Hamano2011-05-191-0/+1
|\ \ \ \ \ \
| * | | | | | copy_gecos: fix not adding nlen to len when processing "&"Rafael Gieschke2011-05-171-0/+1
* | | | | | | Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2011-05-192-6/+117
|\ \ \ \ \ \ \
| * | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-142-5/+32
| * | | | | | | test that git status works with merge conflict in, .gitmodulesHeiko Voigt2011-05-141-4/+88
* | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-198-23/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanismJunio C Hamano2011-05-152-5/+12
| * | | | | | | | inline lookup_replace_object() callsJunio C Hamano2011-05-153-4/+14
| * | | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-154-17/+9
| * | | | | | | | t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
| * | | | | | | | Declare lookup_replace_object() in cache.h, not in commit.hJunio C Hamano2011-05-152-2/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'nd/sparse-co-fix'Junio C Hamano2011-05-192-33/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-102-29/+75
| * | | | | | | | t1011: fix sparse-checkout initialization and add new fileNguyễn Thái Ngọc Duy2011-05-101-4/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-193-38/+340
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-133-2/+79
| * | | | | | | | git-p4: small improvements to user-preservationLuke Diamand2011-05-091-5/+14
| * | | | | | | | git-p4: add option to preserve user namesLuke Diamand2011-04-263-38/+254
* | | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-191-8/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag: disallow '-' as tag nameMichael Schubert2011-05-101-8/+18
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-194-14/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | | | | | | | | send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King2011-05-161-0/+2
| * | | | | | | | | connect: let callers know if connection is a socketJeff King2011-05-162-1/+7
| * | | | | | | | | connect: treat generic proxy processes like ssh processesJeff King2011-05-161-13/+15
* | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-191-2/+2
|\ \ \ \ \ \ \ \ \ \