summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* clone: allow --no-local to turn off local optimizationsJeff King2012-05-303-6/+18
* docs/clone: mention that --local may be ignoredJeff King2012-05-301-7/+10
* Merge git://bogomips.org/git-svnJunio C Hamano2012-05-294-671/+831
|\
| * git-svn: make Git::SVN::Fetcher a separate fileJonathan Nieder2012-05-293-505/+605
| * git-svn: rename SVN::Git::* packages to Git::SVN::*Jonathan Nieder2012-05-291-25/+25
| * git-svn: move Git::SVN::Prompt into its own fileJonathan Nieder2012-05-293-144/+204
* | t5701: modernize styleJeff King2012-05-291-53/+20
* | Merge branch 'va/git-p4-test'Junio C Hamano2012-05-291-3/+107
|\ \
| * | git-p4: Clean up branch test casesVitor Antunes2012-05-291-3/+1
| * | git-p4: Verify detection of "empty" branch creationVitor Antunes2012-05-291-0/+54
| * | git-p4: Test changelists touching two branchesVitor Antunes2012-05-291-0/+52
* | | Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano2012-05-2919-238/+176
|\ \ \
| * | | format-patch: do not use bogus email addresses in message idsJeff King2012-05-241-1/+1
| * | | ident: reject bogus email addresses with IDENT_STRICTJeff King2012-05-241-0/+6
| * | | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-249-15/+14
| * | | format-patch: use GIT_COMMITTER_EMAIL in message idsJeff King2012-05-241-1/+2
| * | | ident: let callers omit name with fmt_indentJeff King2012-05-242-5/+10
| * | | ident: refactor NO_DATE flag in fmt_identJeff King2012-05-241-6/+9
| * | | ident: reword empty ident error messageJeff King2012-05-241-1/+1
| * | | format-patch: refactor get_patch_filenameJeff King2012-05-223-38/+20
| * | | ident: trim whitespace from default name/emailJeff King2012-05-221-1/+4
| * | | ident: use a dynamic strbuf in fmt_identJeff King2012-05-221-28/+15
| * | | ident: use full dns names to generate email addressesJeff King2012-05-221-9/+4
| * | | ident: report passwd errors with a more friendly messageJeff King2012-05-225-25/+20
| * | | drop length limitations on gecos-derived names and emailsJeff King2012-05-223-73/+39
| * | | ident: don't write fallback username into git_default_nameJeff King2012-05-221-3/+1
| * | | fmt_ident: drop IDENT_WARN_ON_NO_NAME codeJeff King2012-05-222-10/+6
| * | | format-patch: use default email for generating message idsJeff King2012-05-221-8/+2
| * | | ident: trim trailing newline from /etc/mailnameJeff King2012-05-221-0/+4
| * | | move git_default_* variables to ident.cJeff King2012-05-223-6/+4
| * | | move identity config parsing to ident.cJeff King2012-05-223-23/+23
| * | | fmt-merge-msg: don't use static buffer in record_personJeff King2012-05-221-4/+4
| * | | http-push: do not access git_default_email directlyJeff King2012-05-221-1/+1
| * | | ident: split setup_ident into separate functionsJeff King2012-05-222-16/+22
* | | | Merge branch 'jk/fetch-pack-remove-dups-optim'Junio C Hamano2012-05-293-22/+54
|\ \ \ \
| * | | | fetch-pack: sort incoming heads list earlierJeff King2012-05-241-1/+1
| * | | | fetch-pack: avoid quadratic loop in filter_refsJeff King2012-05-221-6/+13
| * | | | fetch-pack: sort the list of incoming refsJeff King2012-05-221-0/+2
| * | | | add sorting infrastructure for list refsJeff King2012-05-222-0/+24
| * | | | fetch-pack: avoid quadratic behavior in remove_duplicatesJeff King2012-05-221-15/+6
| * | | | fetch-pack: sort incoming headsJeff King2012-05-221-1/+9
* | | | | Merge branch 'rs/refs-string-slice'Junio C Hamano2012-05-291-29/+41
|\ \ \ \ \
| * | | | | refs: do not create ref_entry when searchingJunio C Hamano2012-05-221-9/+23
| * | | | | refs: use strings directly in find_containing_dir()René Scharfe2012-05-221-9/+4
| * | | | | refs: convert parameter of create_dir_entry() to length-limited stringRené Scharfe2012-05-221-8/+10
| * | | | | refs: convert parameter of search_ref_dir() to length-limited stringRené Scharfe2012-05-221-6/+7
| |/ / / /
* | | | | Merge branch 'mh/fetch-pack-constness'Junio C Hamano2012-05-291-74/+71
|\ \ \ \ \
| * | | | | cmd_fetch_pack(): respect constness of argv parameterMichael Haggerty2012-05-221-13/+10
| * | | | | cmd_fetch_pack(): combine the loop termination conditionsMichael Haggerty2012-05-221-58/+55
| * | | | | cmd_fetch_pack(): handle non-option arguments outside of the loopMichael Haggerty2012-05-221-5/+7