summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-03-26Merge branch 'jk/checkout-orphan-warning'Libravatar Junio C Hamano2-1/+64
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Libravatar Junio C Hamano4-2/+86
2011-03-26Merge branch 'nd/index-doc'Libravatar Junio C Hamano1-0/+185
2011-03-26Merge branch 'jc/fetch-progressive-stride'Libravatar Junio C Hamano1-3/+18
2011-03-26Merge branch 'svn-fe' of git://repo.or.cz/git/jrnLibravatar Junio C Hamano11-83/+156
2011-03-26Merge git-gui 0.14.0Libravatar Junio C Hamano14-437/+3371
2011-03-26vcs-svn: handle log message with embedded NULLibravatar Jonathan Nieder6-13/+94
2011-03-26vcs-svn: avoid unnecessary copying of log message and authorLibravatar Jonathan Nieder1-10/+10
2011-03-26vcs-svn: remove buffer_read_stringLibravatar Jonathan Nieder5-48/+17
2011-03-26vcs-svn: make reading of properties binary-safeLibravatar Jonathan Nieder2-14/+37
2011-03-25Sync with 1.7.4.2Libravatar Junio C Hamano2-2/+11
2011-03-25Git 1.7.4.2Libravatar Junio C Hamano2-1/+8
2011-03-25pull: do not clobber untracked files on initial pullLibravatar Jeff King2-1/+12
2011-03-25merge: merge unborn index before setting refLibravatar Jeff King2-1/+5
2011-03-25t7607: clean up stray untracked fileLibravatar Jeff King1-1/+2
2011-03-25t7607: mark known breakage in test 11 as fixedLibravatar Jeff King1-1/+1
2011-03-25gitweb: Fix handling of fractional timezones in parse_dateLibravatar Jakub Narebski1-2/+4
2011-03-25Merge branch 'ss/git-gui-mergetool'Libravatar Pat Thoyts1-47/+54
2011-03-25git-gui: detect the use of MUI langauge packs on WindowsLibravatar Pat Thoyts1-0/+19
2011-03-24tests: avoid nonportable {foo,bar} globLibravatar Jonathan Nieder1-8/+8
2011-03-24merge: merge with the default upstream branch without argumentLibravatar Junio C Hamano3-4/+56
2011-03-24merge: match the help text with the documentationLibravatar Jared Hance1-2/+3
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryLibravatar Junio C Hamano4-2/+86
2011-03-23doc: technical details about the index file formatLibravatar Junio C Hamano1-37/+57
2011-03-23Merge branch 'kc/gitweb-pathinfo-w-anchor'Libravatar Junio C Hamano1-7/+20
2011-03-23Merge branch 'jn/fortify-source-workaround'Libravatar Junio C Hamano1-6/+11
2011-03-23Merge branch 'jn/maint-c99-format'Libravatar Junio C Hamano6-81/+26
2011-03-23Merge branch 'lt/default-abbrev'Libravatar Junio C Hamano5-3/+23
2011-03-23Merge branch 'pk/stash-apply-status-relative'Libravatar Junio C Hamano2-1/+21
2011-03-23Merge branch 'jc/maint-diff-q-filter'Libravatar Junio C Hamano2-1/+9
2011-03-23Merge branch 'pw/p4'Libravatar Junio C Hamano2-1/+26
2011-03-23rev-list --min-parents,--max-parents: doc, test and completionLibravatar Michael J Gruber4-3/+129
2011-03-23revision.c: introduce --min-parents and --max-parents optionsLibravatar Michael J Gruber5-10/+32
2011-03-22Update draft release notes to 1.7.5Libravatar Junio C Hamano1-0/+27
2011-03-22Merge branch 'mg/rev-list-one-side-only'Libravatar Junio C Hamano10-69/+230
2011-03-22Merge branch 'js/maint-stash-index-copy'Libravatar Junio C Hamano1-6/+5
2011-03-22Merge branch 'tl/p4'Libravatar Junio C Hamano1-10/+27
2011-03-22Merge branch 'mg/doc-bisect-tweak-worktree'Libravatar Junio C Hamano1-23/+38
2011-03-22Merge branch 'jn/test-sanitize-git-env'Libravatar Junio C Hamano8-47/+11
2011-03-22Merge branch 'sp/maint-upload-pack-stop-early'Libravatar Junio C Hamano1-3/+24
2011-03-22Merge branch 'sp/maint-fetch-pack-stop-early'Libravatar Junio C Hamano1-2/+16
2011-03-22Merge branch 'jc/maint-rev-list-culled-boundary'Libravatar Junio C Hamano2-1/+26
2011-03-22Merge branch 'jc/maint-fetch-alt'Libravatar Junio C Hamano5-32/+118
2011-03-22Merge branch 'sg/complete-symmetric-diff'Libravatar Junio C Hamano1-14/+17
2011-03-22Merge branch 'svn-fe' of git://repo.or.cz/git/jrnLibravatar Junio C Hamano8-172/+265
2011-03-22Merge branch 'db/length-as-hash' into svn-feLibravatar Jonathan Nieder1-69/+105
2011-03-22vcs-svn: use strchr to find RFC822 delimiterLibravatar David Barr1-2/+5
2011-03-22vcs-svn: implement perfect hash for top-level keysLibravatar David Barr1-50/+59
2011-03-22vcs-svn: implement perfect hash for node-prop keysLibravatar David Barr1-19/+43
2011-03-22vcs-svn: use strbuf for author, UUID, and URLLibravatar David Barr5-30/+43